/**
* collectd - src/logfile.c
* Copyright (C) 2007 Sebastian Harl
+ * Copyright (C) 2007 Florian Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
#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, "Timestamp")) {
+ if ((strcasecmp (value, "false") == 0)
+ || (strcasecmp (value, "no") == 0)
+ || (strcasecmp (value, "off") == 0))
+ print_timestamp = 0;
+ else
+ print_timestamp = 1;
+ }
else {
return -1;
}
return 0;
} /* int logfile_config (const char *, const char *) */
-static void logfile_log (int severity, const char *msg)
+static void logfile_print (const char *msg, time_t timestamp_time)
{
FILE *fh;
int do_close = 0;
+ struct tm timestamp_tm;
+ char timestamp_str[64];
- if (severity > log_level)
- return;
+ if (print_timestamp)
+ {
+ 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);
}
pthread_mutex_unlock (&file_lock);
return;
+} /* void logfile_print */
+
+static void logfile_log (int severity, const char *msg)
+{
+ if (severity > log_level)
+ return;
+
+ logfile_print (msg, time (NULL));
} /* void logfile_log (int, const char *) */
+int logfile_notification (const notification_t *n)
+{
+ char msg[1024] = "";
+ int status;
+
+ status = snprintf (msg, sizeof (msg), "Notification: %s: message = %s, "
+ "host = %s",
+ (n->severity == NOTIF_FAILURE) ? "FAILURE"
+ : ((n->severity == NOTIF_WARNING) ? "WARNING"
+ : ((n->severity == NOTIF_OKAY) ? "OKAY" : "UNKNOWN")),
+ n->message, n->host);
+ msg[sizeof (msg) - 1] = '\0';
+
+ logfile_print (msg, n->time);
+
+ return (0);
+} /* int logfile_notification */
+
void module_register (void)
{
plugin_register_config ("logfile", logfile_config,
config_keys, config_keys_num);
plugin_register_log ("logfile", logfile_log);
+ plugin_register_notification ("logfile", logfile_notification);
} /* void module_register (void) */
/* vim: set sw=4 ts=4 tw=78 noexpandtab : */