projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
write_prometheus plugin: Escape label values.
[collectd.git]
/
src
/
logfile.c
diff --git
a/src/logfile.c
b/src/logfile.c
index
1179718
..
6d55584
100644
(file)
--- a/
src/logfile.c
+++ b/
src/logfile.c
@@
-27,11
+27,10
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#include <pthread.h>
-
#define DEFAULT_LOGFILE LOCALSTATEDIR"/log/collectd.log"
#if COLLECT_DEBUG
#define DEFAULT_LOGFILE LOCALSTATEDIR"/log/collectd.log"
#if COLLECT_DEBUG
@@
-91,7
+90,6
@@
static void logfile_print (const char *msg, int severity,
{
FILE *fh;
_Bool do_close = 0;
{
FILE *fh;
_Bool do_close = 0;
- struct tm timestamp_tm;
char timestamp_str[64];
char level_str[16] = "";
char timestamp_str[64];
char level_str[16] = "";
@@
-121,8
+119,8
@@
static void logfile_print (const char *msg, int severity,
if (print_timestamp)
{
if (print_timestamp)
{
-
time_t tt = CDTIME_T_TO_TIME_T (timestamp_time)
;
- localtime_r (&
tt
, ×tamp_tm);
+
struct tm timestamp_tm
;
+ localtime_r (&
CDTIME_T_TO_TIME_T (timestamp_time)
, ×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);