From: Jeff King Date: Wed, 3 Aug 2016 23:01:04 +0000 (-0400) Subject: trace: disable key after write error X-Git-Tag: v2.10.0-rc0~10^2~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/46ac74b71681f1d2ff29615236193e651dcdd9fe?ds=inline;hp=--cc trace: disable key after write error 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 Signed-off-by: Junio C Hamano --- 46ac74b71681f1d2ff29615236193e651dcdd9fe diff --git a/trace.c b/trace.c index 4efb256fa2..083eb984e1 100644 --- 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); } }