lib/util/debug.c force timestamps

diff --git a/lib/util/debug.c b/lib/util/debug.c
index 86f13f181cf00f059eee4f9ecb205bab0e4e7062..1977fe14996f9a3ac2c65dab4e490a764f2b8912 100644 (file)
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -1747,6 +1747,7 @@ bool dbghdrclass(int level, int cls, const char *location, const char *func)
 
        dbgsetclass(level, cls);
 
+<<<<<<< HEAD
        /*
         * Don't print a header if we're logging to stdout,
         * unless 'debug syslog format = always'
@@ -1755,6 +1756,12 @@ bool dbghdrclass(int level, int cls, const char *location, const char *func)
            state.settings.debug_syslog_format != DEBUG_SYSLOG_FORMAT_ALWAYS)
        {
                return true;
+=======
+       /* Don't print a header if we're logging to stdout. */
+       if (state.logtype != DEBUG_FILE ) {
+               state.settings.debug_prefix_timestamp = true;
+               state.settings.debug_hires_timestamp = true;
+>>>>>>> 230b4bd59e56 (lib/util/debug.c force timestamps)
        }
 
        /*
@@ -1764,9 +1771,15 @@ bool dbghdrclass(int level, int cls, const char *location, const char *func)
         */
        if (!(state.settings.timestamp_logs ||
              state.settings.debug_prefix_timestamp ||
+<<<<<<< HEAD
              state.settings.debug_syslog_format != DEBUG_SYSLOG_FORMAT_NO))
        {
                return true;
+=======
+             state.settings.debug_syslog_format)) {
+               state.settings.debug_prefix_timestamp = true;
+               state.settings.debug_hires_timestamp = true;
+>>>>>>> 230b4bd59e56 (lib/util/debug.c force timestamps)
        }
 
        GetTimeOfDay(&tv);