[PATCH v3] send-email: --batch-size to work around some SMTP server limit

[PATCH v3] send-email: --batch-size to work around some SMTP server limit

[xiaoqiang zhao]

Some email servers (e.g. smtp.163.com) limit the number emails to be
sent per session(connection) and this will lead to a faliure when
sending many messages.

Teach send-email to disconnect after sending a number of messages
(configurable via the --batch-size=<num> option), wait for a few
seconds (configurable via the --relogin-delay=<seconds> option) and
reconnect, to work around such a limit.

Also add this two configure option for git config command.

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
 contrib/completion/git-completion.bash |  2 ++
 git-send-email.perl                    | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index af658995d..29496353a 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2608,6 +2608,8 @@ _git_config ()
 		sendemail.thread
 		sendemail.to
 		sendemail.validate
+		sendemail.smtpbatchsize
+		sendemail.smtprelogindelay
 		showbranch.default
 		status.relativePaths
 		status.showUntrackedFiles
diff --git a/git-send-email.perl b/git-send-email.perl
index eea0a517f..5cbe97898 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -81,6 +81,10 @@ git send-email --dump-aliases
                                      This setting forces to use one of the listed mechanisms.
     --smtp-debug            <0|1>  * Disable, enable Net::SMTP debug.
 
+    --batch-size            <int>  * send max <int> message per connection.
+    --relogin-delay         <int>  * delay <int> seconds between two successive login, default to 1,
+                                     This option can only be used with --batch-size
+
   Automating:
     --identity              <str>  * Use the sendemail.<id> options.
     --to-cmd                <str>  * Email To: via `<str> \$patch_path`
@@ -153,6 +157,7 @@ my $have_email_valid = eval { require Email::Valid; 1 };
 my $have_mail_address = eval { require Mail::Address; 1 };
 my $smtp;
 my $auth;
+my $num_sent = 0;
 
 # Regexes for RFC 2047 productions.
 my $re_token = qr/[^][()<>@,;:\\"\/?.= \000-\037\177-\377]+/;
@@ -216,6 +221,7 @@ my ($cover_cc, $cover_to);
 my ($to_cmd, $cc_cmd);
 my ($smtp_server, $smtp_server_port, @smtp_server_options);
 my ($smtp_authuser, $smtp_encryption, $smtp_ssl_cert_path);
+my ($batch_size, $relogin_delay) = (0, 0);
 my ($identity, $aliasfiletype, @alias_files, $smtp_domain, $smtp_auth);
 my ($validate, $confirm);
 my (@suppress_cc);
@@ -247,6 +253,8 @@ my %config_settings = (
     "smtppass" => \$smtp_authpass,
     "smtpdomain" => \$smtp_domain,
     "smtpauth" => \$smtp_auth,
+    "smtpbatchsize" => \$batch_size,
+    "smtprelogindelay" => \$relogin_delay,
     "to" => \@initial_to,
     "tocmd" => \$to_cmd,
     "cc" => \@initial_cc,
@@ -358,6 +366,8 @@ $rc = GetOptions(
 		    "force" => \$force,
 		    "xmailer!" => \$use_xmailer,
 		    "no-xmailer" => sub {$use_xmailer = 0},
+		    "batch-size=i" => \$batch_size,
+		    "relogin-delay=i" => \$relogin_delay,
 	 );
 
 usage() if $help;
@@ -1664,6 +1674,14 @@ foreach my $t (@files) {
 		}
 	}
 	$message_id = undef;
+	$num_sent++;
+	if ($num_sent == $batch_size) {
+		$num_sent = 0;
+		$smtp->quit;
+		$smtp = undef;
+		$auth = 0;
+		sleep($relogin_delay);
+	}
 }
 
 # Execute a command (e.g. $to_cmd) to get a list of email addresses
-- 
2.13.0.rc2.1.gd46ef338b.dirty

Re: [PATCH v3] send-email: --batch-size to work around some SMTP server limit

[Junio C Hamano]

xiaoqiang zhao <zxq_yx_007@163.com> writes:

> @@ -1664,6 +1674,14 @@ foreach my $t (@files) {
>  		}
>  	}
>  	$message_id = undef;
> +	$num_sent++;
> +	if ($num_sent == $batch_size) {
> +		$num_sent = 0;
> +		$smtp->quit;
> +		$smtp = undef;
> +		$auth = 0;

Two suggestions.

 (1) I do not think $smtp is always valid when we come here; it is
     unsafe to unconditionally say $smtp->quit like this patch does.

	$smtp->quit if defined $smtp;

     may help codepaths like $dry_run and also the case where
     $smtp_server is the absolute path to a local program.

 (2) You are setting $auth to zero to force re-authentication to
     happen.  It would be more consistent to the state of $auth that
     is not-yet-used to "undef $auth;" here instead.  After all, the
     variable starts its life in an undefined state.


So all in all

	$smtp->quit if defined $smtp;
	undef $smtp;
	undef $auth;

perhaps?

This change of course forces re-authentication every N messages,
which may not hurt those who use some form of credential helper, but
that may be something we want to mention in the log message.

> +		sleep($relogin_delay);
> +	}
>  }

Thanks.

Re: [PATCH v3] send-email: --batch-size to work around some SMTP server limit

[赵小强]

> 在 2017年5月8日，12:11，Junio C Hamano <gitster@pobox.com> 写道：
> 
> Two suggestions.
> 
> (1) I do not think $smtp is always valid when we come here; it is
>     unsafe to unconditionally say $smtp->quit like this patch does.
> 
>    $smtp->quit if defined $smtp;
> 
>     may help codepaths like $dry_run and also the case where
>     $smtp_server is the absolute path to a local program.
> 

Hmm，missed this code path.

> (2) You are setting $auth to zero to force re-authentication to
>     happen.  It would be more consistent to the state of $auth that
>     is not-yet-used to "undef $auth;" here instead.  After all, the
>     variable starts its life in an undefined state.
> 
> 
> So all in all
> 
>    $smtp->quit if defined $smtp;
>    undef $smtp;
>    undef $auth;
> 
> perhaps?
> 
> This change of course forces re-authentication every N messages,
> which may not hurt those who use some form of credential helper, but
> that may be something we want to mention in the log message.

Yes, it' s better to undef $auth here. I will update the commit message next version.

Thank you very much for your helpful suggestions ！

> 
>> +        sleep($relogin_delay);
>> +    }
>> }
> 
> Thanks.