From: Junio C Hamano <gitster@pobox.com>
To: kusmabite@gmail.com
Cc: Dave Zarzycki <zarzycki@apple.com>, git@vger.kernel.org
Subject: Re: [PATCH] Do not log unless all connect() attempts fail
Date: Wed, 13 Jul 2011 13:39:18 -0700 [thread overview]
Message-ID: <7v1uxt7w5l.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CABPQNSaPXmHE1qECUbG9oWU43HbAXxAY42T1P=MNHgkkWM936w@mail.gmail.com> (Erik Faye-Lund's message of "Wed, 13 Jul 2011 11:23:33 +0200")
Erik Faye-Lund <kusmabite@gmail.com> writes:
>> diff --git a/connect.c b/connect.c
>> index 2119c3f..8eb9f44 100644
>> --- a/connect.c
>> +++ b/connect.c
>> @@ -225,11 +226,8 @@ static int git_tcp_connect_sock(char *host, int flags)
>> }
>> if (connect(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
>> saved_errno = errno;
>> + strbuf_addf(&error_message, "%s[%d: %s]: errno=%s\n",
>> + host, cnt, ai_name(ai), strerror(saved_errno));
>> close(sockfd);
>> sockfd = -1;
>> continue;
>> @@ -242,11 +240,13 @@ static int git_tcp_connect_sock(char *host, int flags)
>> freeaddrinfo(ai0);
>>
>> if (sockfd < 0)
>> - die("unable to connect a socket (%s)", strerror(saved_errno));
>> + die("unable to connect to %s:\n%s", host, error_message.buf);
>>
>
> This kills the output from the case where "sockfd < 0" evaluates to
> true for the last entry in ai, no (just above your second hunk), no?
> In that case errno gets copied to saved_errno, and the old output
> would do strerror(old_errno), but now you just print the log you've
> gathered, and don't even look at saved_errno.
>
> If this is intentional then you should probably kill the saved_errno
> variable also, it's rendered pointless by this patch.
As error_message.buf contains strerror([saved_]errno), I think it is
intentional to remove strerror() from the final die(). Without looking at
the code outside the context of the patch I cannot tell if saved_errno has
become unneeded, but I tend to trust your analysis so...
next prev parent reply other threads:[~2011-07-13 20:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-12 16:28 [PATCH] Do not log unless all connect() attempts fail Dave Zarzycki
2011-07-13 9:23 ` Erik Faye-Lund
2011-07-13 20:39 ` Junio C Hamano [this message]
2011-07-13 21:06 ` Jeff King
2011-07-13 22:29 ` Erik Faye-Lund
2011-07-13 23:43 ` Jeff King
-- strict thread matches above, loose matches on Subject: below --
2011-06-09 17:52 Dave Zarzycki
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v1uxt7w5l.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=kusmabite@gmail.com \
--cc=zarzycki@apple.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox