Merge branch 'collectd-4.10' into collectd-5.0

[collectd.git] / src / logfile.c

diff --git a/src/logfile.c b/src/logfile.c
index 6da13df..60fb5d9 100644 (file)
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -39,14 +39,14 @@ static pthread_mutex_t file_lock = PTHREAD_MUTEX_INITIALIZER;
 
 static char *log_file = NULL;
 static int print_timestamp = 1;
-static int print_level = 0;
+static int print_severity = 0;
 
 static const char *config_keys[] =
 {
        "LogLevel",
        "File",
        "Timestamp",
-       "PrintLevel"
+       "PrintSeverity"
 };
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
@@ -80,11 +80,11 @@ static int logfile_config (const char *key, const char *value)
                        print_timestamp = 0;
                else
                        print_timestamp = 1;
-       } else if (0 == strcasecmp(key, "PrintLevel")) {
+       } else if (0 == strcasecmp(key, "PrintSeverity")) {
                if (IS_FALSE (value))
-                       print_level = 0;
+                       print_severity = 0;
                else
-                       print_level = 1;
+                       print_severity = 1;
        }
        else {
                return -1;
@@ -92,7 +92,8 @@ static int logfile_config (const char *key, const char *value)
        return 0;
 } /* int logfile_config (const char *, const char *) */
 
-static void logfile_print (const char *msg, int severity, time_t timestamp_time)
+static void logfile_print (const char *msg, int severity,
+               cdtime_t timestamp_time)
 {
        FILE *fh;
        int do_close = 0;
@@ -100,7 +101,7 @@ static void logfile_print (const char *msg, int severity, time_t timestamp_time)
        char timestamp_str[64];
        char level_str[16] = "";
 
-       if (print_level)
+       if (print_severity)
        {
                switch (severity)
                {
@@ -126,7 +127,8 @@ static void logfile_print (const char *msg, int severity, time_t timestamp_time)
 
        if (print_timestamp)
        {
-               localtime_r (&timestamp_time, &timestamp_tm);
+               time_t tt = CDTIME_T_TO_TIME_T (timestamp_time);
+               localtime_r (&tt, &timestamp_tm);
 
                strftime (timestamp_str, sizeof (timestamp_str), "%Y-%m-%d %H:%M:%S",
                                &timestamp_tm);
@@ -179,7 +181,7 @@ static void logfile_log (int severity, const char *msg,
        if (severity > log_level)
                return;
 
-       logfile_print (msg, severity, time (NULL));
+       logfile_print (msg, severity, cdtime ());
 } /* void logfile_log (int, const char *) */
 
 static int logfile_notification (const notification_t *n,
@@ -218,7 +220,7 @@ static int logfile_notification (const notification_t *n,
        buf[sizeof (buf) - 1] = '\0';
 
        logfile_print (buf, LOG_INFO,
-                       (n->time > 0) ? n->time : time (NULL));
+                       (n->time != 0) ? n->time : cdtime ());
 
        return (0);
 } /* int logfile_notification */