On Thu, Aug 04, 2016 at 02:28:09PM -0700, Junio C Hamano wrote:

> Jeff King <p...@peff.net> writes:
> > I wondered if that would then let us drop set_warn_routine(), but it
> > looks like there are other warning() calls it cares about. So that would
> > invalidate the last paragraph here, though I still think converting the
> > trace errors to warning() is a reasonable thing to do.
> Yes.  That is why tonight's pushout will have this series in 'jch'
> (that is a point on a linear history between 'master' and 'pu') and
> tentatively ejects cc/apply-am topic out of 'pu', expecting it to be
> rerolled.

Here's a replacement patch 3. Same code, but it clarifies the
warn_routine situation in the commit message.

-- >8 --
Subject: [PATCH] trace: use warning() for printing trace errors

Right now we just fprintf() straight to stderr, which can
make the output hard to distinguish. It would be helpful to
give it one of our usual prefixes like "error:", "warning:",

It doesn't make sense to use error() here, as the trace code
is "optional" debugging code. If something goes wrong, we
should warn the user, but saying "error" implies the actual
git operation had a problem. So warning() is the only sane

Note that this does end up calling warn_routine() to do the
formatting. This is probably a good thing, since they are
clearly trying to hook messages before they make it to
stderr. However, it also means that in theory somebody who
tries to trace from their warn_routine() could cause a loop.
This seems rather unlikely in practice (we've never even
overridden the default warn_builtin routine before, and
recent discussions to do so would just install a noop

Signed-off-by: Jeff King <p...@peff.net>
 trace.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/trace.c b/trace.c
index bdbe149..6a77e4d 100644
--- a/trace.c
+++ b/trace.c
@@ -61,9 +61,8 @@ static int get_trace_fd(struct trace_key *key)
        else if (is_absolute_path(trace)) {
                int fd = open(trace, O_WRONLY | O_APPEND | O_CREAT, 0666);
                if (fd == -1) {
-                       fprintf(stderr,
-                               "Could not open '%s' for tracing: %s\n"
-                               "Defaulting to tracing on stderr...\n",
+                       warning("Could not open '%s' for tracing: %s\n"
+                               "Defaulting to tracing on stderr...",
                                trace, strerror(errno));
                        key->fd = STDERR_FILENO;
                } else {
@@ -71,10 +70,10 @@ static int get_trace_fd(struct trace_key *key)
                        key->need_close = 1;
        } else {
-               fprintf(stderr, "What does '%s' for %s mean?\n"
+               warning("What does '%s' for %s mean?\n"
                        "If you want to trace into a file, then please set "
                        "%s to an absolute pathname (starting with /).\n"
-                       "Defaulting to tracing on stderr...\n",
+                       "Defaulting to tracing on stderr...",
                        trace, key->key, key->key);
                key->fd = STDERR_FILENO;
@@ -135,7 +134,7 @@ static int prepare_trace_line(const char *file, int line,
 static void trace_write(struct trace_key *key, const void *buf, unsigned len)
        if (write_in_full(get_trace_fd(key), buf, len) < 0)
-               fprintf(stderr, "%s: write error (%s)\n", err_msg, 
+               warning("%s: write error (%s)", err_msg, strerror(errno));
 void trace_verbatim(struct trace_key *key, const void *buf, unsigned len)

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to