util/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 commit is contained in:
Simon Ser 2020-05-01 16:21:57 +02:00 committed by Drew DeVault
parent 044a9f28d6
commit 904312a0b2

View file

@ -15,9 +15,16 @@ static struct timespec start_time = {-1};
static const char *verbosity_colors[] = { static const char *verbosity_colors[] = {
[WLR_SILENT] = "", [WLR_SILENT] = "",
[WLR_ERROR ] = "\x1B[1;31m", [WLR_ERROR] = "\x1B[1;31m",
[WLR_INFO ] = "\x1B[1;34m", [WLR_INFO] = "\x1B[1;34m",
[WLR_DEBUG ] = "\x1B[1;30m", [WLR_DEBUG] = "\x1B[1;30m",
};
static const char *verbosity_headers[] = {
[WLR_SILENT] = "",
[WLR_ERROR] = "[ERROR]",
[WLR_INFO] = "[INFO]",
[WLR_DEBUG] = "[DEBUG]",
}; };
static void timespec_sub(struct timespec *r, const struct timespec *a, static void timespec_sub(struct timespec *r, const struct timespec *a,
@ -58,6 +65,8 @@ static void log_stderr(enum wlr_log_importance verbosity, const char *fmt,
if (colored && isatty(STDERR_FILENO)) { if (colored && isatty(STDERR_FILENO)) {
fprintf(stderr, "%s", verbosity_colors[c]); fprintf(stderr, "%s", verbosity_colors[c]);
} else {
fprintf(stderr, "%s ", verbosity_headers[c]);
} }
vfprintf(stderr, fmt, args); vfprintf(stderr, fmt, args);