From: 赵小强 <zxq_yx_007@163.com>
To: Jan Viktorin <viktorin@rehivetech.com>
Cc: git@vger.kernel.org, gitster@pobox.com, mst@kernel.org,
pbonzini@redhat.com, mina86@mina86.com, artagnon@gmail.com,
avarab@gmail.com
Subject: Re: [PATCH v4] send-email: --batch-size to work around some SMTP server limit
Date: Tue, 16 May 2017 21:55:18 +0800 [thread overview]
Message-ID: <2BB8B551-01A6-4470-9370-5B1A03EB96D0@163.com> (raw)
In-Reply-To: <20170516141014.6e8487df.viktorin@rehivetech.com>
> 在 2017年5月16日,20:10,Jan Viktorin <viktorin@rehivetech.com> 写道:
>
> Hello,
>
> with this patch applied to git 2.12, I could see:
>
> Use of uninitialized value $batch_size in numeric eq (==) at /usr/lib/git-core/git-send-email line 1679
>
> when --batch-size is NOT used. See below...
>
> On Sat, 13 May 2017 09:57:26 +0800
> xiaoqiang zhao <zxq_yx_007@163.com> wrote:
>
>> 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.
>>
>> Note:
>> Re-authentication will happen every $<batch-size> messages, so it
>> will be much more acceptable if you use some form of credential helper
>> (e.g. the 'sendemail.smtppass' config option), otherwise you will have
>> to retype password every time when asked.
>>
>> 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..071d1ab9d 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);
>> 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) {
>
> This is the line. I think, batch_size can be sometimes uninitialized
> while this statement is executed.
>
> Regards
> Jan
Thank you for reporting this,I will take a look .
>
>> + $num_sent = 0;
>> + $smtp->quit if defined $smtp;
>> + undef $smtp;
>> + undef $auth;
>> + sleep($relogin_delay);
>> + }
>> }
>>
>> # Execute a command (e.g. $to_cmd) to get a list of email addresses
next prev parent reply other threads:[~2017-05-16 13:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-13 1:57 [PATCH v4] send-email: --batch-size to work around some SMTP server limit xiaoqiang zhao
2017-05-15 3:59 ` Junio C Hamano
2017-05-16 23:49 ` Junio C Hamano
2017-05-17 0:03 ` 赵小强
2017-05-16 12:10 ` Jan Viktorin
2017-05-16 13:55 ` 赵小强 [this message]
2017-05-16 17:43 ` Ævar Arnfjörð Bjarmason
2017-05-17 0:04 ` 赵小强
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2BB8B551-01A6-4470-9370-5B1A03EB96D0@163.com \
--to=zxq_yx_007@163.com \
--cc=artagnon@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mina86@mina86.com \
--cc=mst@kernel.org \
--cc=pbonzini@redhat.com \
--cc=viktorin@rehivetech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).