From 1dbb6990360ad45d7189d267e1c288b8cf38b4d1 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 10 Dec 2020 09:26:02 +0100 Subject: [PATCH] common/log: write log importance When colors aren't used, write the log importance to stderr. This makes it easier to grep for errors and avoids mistaking error messages for debug messages. This is [1] ported to Sway. [1]: https://github.com/swaywm/wlroots/pull/2149 --- common/log.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/common/log.c b/common/log.c index 2acf2e57..483420e7 100644 --- a/common/log.c +++ b/common/log.c @@ -45,6 +45,13 @@ static const char *verbosity_colors[] = { [SWAY_DEBUG ] = "\x1B[1;90m", }; +static const char *verbosity_headers[] = { + [SWAY_SILENT] = "", + [SWAY_ERROR] = "[ERROR]", + [SWAY_INFO] = "[INFO]", + [SWAY_DEBUG] = "[DEBUG]", +}; + static void timespec_sub(struct timespec *r, const struct timespec *a, const struct timespec *b) { const long NSEC_PER_SEC = 1000000000; @@ -84,6 +91,8 @@ static void sway_log_stderr(sway_log_importance_t verbosity, const char *fmt, if (colored && isatty(STDERR_FILENO)) { fprintf(stderr, "%s", verbosity_colors[c]); + } else { + fprintf(stderr, "%s ", verbosity_headers[c]); } vfprintf(stderr, fmt, args);