With errno fix: [PATCH] Do not log unless all connect() attempts fail
- From
Dave Zarzycki <zarzycki@apple.com>
- Date
- Jul 13, 2011, 16:28 UTC
- Message-ID
- <7276ACEE-EF52-49DF-83EA-642DE504B3EA@apple.com>
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; + } sockfd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); if (sockfd < 0) { @@ -225,11 +231,6 @@ static int git_tcp_connect_sock(char *host, int flags) } if (connect(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) { saved_errno = errno; - fprintf(stderr, "%s[%d: %s]: errno=%s\n", - host, - cnt, - ai_name(ai), - strerror(saved_errno)); close(sockfd); sockfd = -1; continue; @@ -242,11 +243,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); if (flags & CONNECT_VERBOSE) fprintf(stderr, "done.\n"); + strbuf_release(&error_message); + return sockfd; }
-- 1.7.6.135.g8cdba