Re: With errno fix: [PATCH] Do not log unless all connect() attempts fail
- From
Erik Faye-Lund <kusmabite@gmail.com>
- Date
- Jul 13, 2011, 18:47 UTC
- Message-ID
- <CABPQNSYWKVngfoj4AqTCbWixENSmgnbdDBGBt+EpWnBgbqpofg@mail.gmail.com>
- In-Reply-To
- <7276ACEE-EF52-49DF-83EA-642DE504B3EA@apple.com>
On Wed, Jul 13, 2011 at 6:28 PM, Dave Zarzycki <zarzycki@apple.com> wrote:
Show 30 quoted lines
> IPv6 hosts are often unreachable on the primarily IPv4 Internet and
> therefore we shouldn't print an error if there are still other hosts we
> can try to connect() to. This helps "git fetch --quiet" stay quiet.
>
> Signed-off-by: Dave Zarzycki <zarzycki@apple.com>
> ---
> connect.c | 15 +++++++++------
> 1 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/connect.c b/connect.c
> index 2119c3f..87b2e3f 100644
> --- a/connect.c
> +++ b/connect.c
> @@ -192,6 +192,7 @@ static const char *ai_name(const struct addrinfo *ai)
> */
> static int git_tcp_connect_sock(char *host, int flags)
> {
> + struct strbuf error_message = STRBUF_INIT;
> int sockfd = -1, saved_errno = 0;
> const char *port = STR(DEFAULT_GIT_PORT);
> struct addrinfo hints, *ai0, *ai;
> @@ -217,6 +218,11 @@ static int git_tcp_connect_sock(char *host, int flags)
> fprintf(stderr, "done.\nConnecting to %s (port %s) ... ", host, port);
>
> for (ai0 = ai; ai; ai = ai->ai_next) {
> + if (saved_errno) {
> + strbuf_addf(&error_message, "%s[%d: %s]: errno=%s\n",
> + host, cnt, ai_name(ai), strerror(saved_errno));
> + saved_errno = 0;
> + }Uhm, this will still fail to report errors for the very last entry, no? When socket returns -1 in the last iteration (and errno gets saved), there's no code that reports it...