projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various plugins: Convert more plugins to use "derive" instead of "counter".
[collectd.git]
/
src
/
logfile.c
diff --git
a/src/logfile.c
b/src/logfile.c
index
6d0f6e0
..
60fb5d9
100644
(file)
--- a/
src/logfile.c
+++ b/
src/logfile.c
@@
-92,7
+92,8
@@
static int logfile_config (const char *key, const char *value)
return 0;
} /* int logfile_config (const char *, const char *) */
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;
{
FILE *fh;
int do_close = 0;
@@
-126,7
+127,8
@@
static void logfile_print (const char *msg, int severity, time_t timestamp_time)
if (print_timestamp)
{
if (print_timestamp)
{
- localtime_r (×tamp_time, ×tamp_tm);
+ time_t tt = CDTIME_T_TO_TIME_T (timestamp_time);
+ localtime_r (&tt, ×tamp_tm);
strftime (timestamp_str, sizeof (timestamp_str), "%Y-%m-%d %H:%M:%S",
×tamp_tm);
strftime (timestamp_str, sizeof (timestamp_str), "%Y-%m-%d %H:%M:%S",
×tamp_tm);
@@
-179,7
+181,7
@@
static void logfile_log (int severity, const char *msg,
if (severity > log_level)
return;
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,
} /* 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,
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 */
return (0);
} /* int logfile_notification */