trace: disable key after write error
authorJeff King <peff@peff.net>
Wed, 3 Aug 2016 23:01:04 +0000 (19:01 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Aug 2016 16:28:16 +0000 (09:28 -0700)
If we get a write error writing to a trace descriptor, the
error isn't likely to go away if we keep writing. Instead,
you'll just get the same error over and over. E.g., try:

GIT_TRACE_PACKET=42 git ls-remote >/dev/null

You don't really need to see:

warning: unable to write trace for GIT_TRACE_PACKET: Bad file descriptor

hundreds of times. We could fallback to tracing to stderr,
as we do in the error code-path for open(), but there's not
much point. If the user fed us a bogus descriptor, they're
probably better off fixing their invocation. And if they
didn't, and we saw a transient error (e.g., ENOSPC writing
to a file), it probably doesn't help anybody to have half of
the trace in a file, and half on stderr.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
trace.c
diff --git a/trace.c b/trace.c
index 4efb256fa294b1a71664e7caaccd81cce9c2a5ac..083eb984e15ea4d65c1f7c3250f7e69775c66d74 100644 (file)
--- a/trace.c
+++ b/trace.c
@@ -134,6 +134,7 @@ static void trace_write(struct trace_key *key, const void *buf, unsigned len)
                normalize_trace_key(&key);
                warning("unable to write trace for %s: %s",
                        key->key, strerror(errno));
+               trace_disable(key);
        }
 }