aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--common/logging.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/common/logging.c b/common/logging.c
index b6bafc79d..c70ba355d 100644
--- a/common/logging.c
+++ b/common/logging.c
@@ -687,14 +687,15 @@ do_logv (int level, int ignore_arg_ptr, const char *fmt, va_list arg_ptr)
else
es_fprintf_unlocked (logstream, "[%u]", (unsigned int)getpid ());
}
- if (!with_time || force_prefixes)
+ if ((!with_time && (with_prefix || with_pid)) || force_prefixes)
es_putc_unlocked (':', logstream);
/* A leading backspace suppresses the extra space so that we can
correctly output, programname, filename and linenumber. */
if (fmt && *fmt == '\b')
fmt++;
else
- es_putc_unlocked (' ', logstream);
+ if (with_time || with_prefix || with_pid || force_prefixes)
+ es_putc_unlocked (' ', logstream);
}
switch (level)