#include <pthread.h>
+#define DEFAULT_LOGFILE LOCALSTATEDIR"/log/collectd.log"
+
#if COLLECT_DEBUG
static int log_level = LOG_DEBUG;
#else
static pthread_mutex_t file_lock = PTHREAD_MUTEX_INITIALIZER;
static char *log_file = NULL;
+static int print_timestamp = 1;
static const char *config_keys[] =
{
"LogLevel",
- "File"
+ "File",
+ "Timestamp"
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
sfree (log_file);
log_file = strdup (value);
}
+ else if (0 == strcasecmp (key, "File")) {
+ if ((strcasecmp (value, "false") == 0)
+ || (strcasecmp (value, "no") == 0)
+ || (strcasecmp (value, "off") == 0))
+ print_timestamp = 0;
+ else
+ print_timestamp = 1;
+ }
else {
return -1;
}
{
FILE *fh;
int do_close = 0;
+ time_t timestamp_time;
+ struct tm timestamp_tm;
+ char timestamp_str[64];
if (severity > log_level)
return;
+ if (print_timestamp)
+ {
+ timestamp_time = time (NULL);
+ localtime_r (×tamp_time, ×tamp_tm);
+
+ strftime (timestamp_str, sizeof (timestamp_str), "%Y-%m-%d %H:%M:%S",
+ ×tamp_tm);
+ timestamp_str[sizeof (timestamp_str) - 1] = '\0';
+ }
+
pthread_mutex_lock (&file_lock);
- if ((log_file == NULL) || (strcasecmp (log_file, "stderr") == 0))
+ if (log_file == NULL)
+ {
+ fh = fopen (DEFAULT_LOGFILE, "a");
+ do_close = 1;
+ }
+ else if (strcasecmp (log_file, "stderr") == 0)
fh = stderr;
else if (strcasecmp (log_file, "stdout") == 0)
fh = stdout;
{
char errbuf[1024];
fprintf (stderr, "logfile plugin: fopen (%s) failed: %s\n",
- (log_file == NULL) ? "<null>" : log_file,
+ (log_file == NULL) ? DEFAULT_LOGFILE : log_file,
sstrerror (errno, errbuf, sizeof (errbuf)));
}
else
{
- fprintf (fh, "%s\n", msg);
+ if (print_timestamp)
+ fprintf (fh, "[%s] %s\n", timestamp_str, msg);
+ else
+ fprintf (fh, "%s\n", msg);
+
if (do_close != 0)
fclose (fh);
}