X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flogfile.c;h=382386b75552fa0915d9ade6ded18bc5b9954f3d;hb=654783aed1fab02766a9cc036e859799e01f6f9e;hp=fed0a75ebc154bcb96598e077b7588e58fa83c9d;hpb=1edbe3e599e3318f89e0ee57d83640c7d02f9079;p=collectd.git

diff --git a/src/logfile.c b/src/logfile.c
index fed0a75e..382386b7 100644
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -1,6 +1,7 @@
 /**
- * collectd - src/stderr.c
+ * collectd - src/logfile.c
  * Copyright (C) 2007  Sebastian Harl
+ * Copyright (C) 2007,2008  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
@@ -26,6 +27,8 @@
 
 #include <pthread.h>
 
+#define DEFAULT_LOGFILE LOCALSTATEDIR"/log/collectd.log"
+
 #if COLLECT_DEBUG
 static int log_level = LOG_DEBUG;
 #else
@@ -35,15 +38,17 @@ static int log_level = LOG_INFO;
 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);
 
-static int stderr_config (const char *key, const char *value)
+static int logfile_config (const char *key, const char *value)
 {
 	if (0 == strcasecmp (key, "LogLevel")) {
 		if ((0 == strcasecmp (value, "emerg"))
@@ -66,34 +71,46 @@ static int stderr_config (const char *key, const char *value)
 	}
 	else if (0 == strcasecmp (key, "File")) {
 		sfree (log_file);
-
-		if (access (value, W_OK) == 0)
-			log_file = strdup (value);
-		else {
-			char errbuf[1024];
-			/* We can't use `ERROR' yet.. */
-			fprintf (stderr, "stderr plugin: Access to %s denied: %s\n",
-					value, sstrerror (errno, errbuf, sizeof (errbuf)));
-			return 1;
-		}
+		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 stderr_config (const char *, const char *) */
+} /* int logfile_config (const char *, const char *) */
 
-static void stderr_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 (&timestamp_time, &timestamp_tm);
+
+		strftime (timestamp_str, sizeof (timestamp_str), "%Y-%m-%d %H:%M:%S",
+				&timestamp_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;
@@ -106,13 +123,17 @@ static void stderr_log (int severity, const char *msg)
 	if (fh == NULL)
 	{
 			char errbuf[1024];
-			fprintf (stderr, "stderr plugin: fopen (%s) failed: %s\n",
-					(log_file == NULL) ? "<null>" : log_file,
+			fprintf (stderr, "logfile plugin: fopen (%s) failed: %s\n",
+					(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);
 	}
@@ -120,14 +141,61 @@ static void stderr_log (int severity, const char *msg)
 	pthread_mutex_unlock (&file_lock);
 
 	return;
-} /* void stderr_log (int, const char *) */
+} /* 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 *) */
+
+static int logfile_notification (const notification_t *n)
+{
+	char  buf[1024] = "";
+	char *buf_ptr = buf;
+	int   buf_len = sizeof (buf);
+	int status;
+
+	status = ssnprintf (buf_ptr, buf_len, "Notification: severity = %s",
+			(n->severity == NOTIF_FAILURE) ? "FAILURE"
+			: ((n->severity == NOTIF_WARNING) ? "WARNING"
+				: ((n->severity == NOTIF_OKAY) ? "OKAY" : "UNKNOWN")));
+	if (status > 0)
+	{
+		buf_ptr += status;
+		buf_len -= status;
+	}
+
+#define APPEND(bufptr, buflen, key, value) \
+	if ((buflen > 0) && (strlen (value) > 0)) { \
+		int status = ssnprintf (bufptr, buflen, ", %s = %s", key, value); \
+		if (status > 0) { \
+			bufptr += status; \
+			buflen -= status; \
+		} \
+	}
+	APPEND (buf_ptr, buf_len, "host", n->host);
+	APPEND (buf_ptr, buf_len, "plugin", n->plugin);
+	APPEND (buf_ptr, buf_len, "plugin_instance", n->plugin_instance);
+	APPEND (buf_ptr, buf_len, "type", n->type);
+	APPEND (buf_ptr, buf_len, "type_instance", n->type_instance);
+	APPEND (buf_ptr, buf_len, "message", n->message);
+
+	buf[sizeof (buf) - 1] = '\0';
+
+	logfile_print (buf, n->time);
+
+	return (0);
+} /* int logfile_notification */
 
 void module_register (void)
 {
-	plugin_register_config ("stderr", stderr_config,
+	plugin_register_config ("logfile", logfile_config,
 			config_keys, config_keys_num);
-	plugin_register_log ("stderr", stderr_log);
-	return;
+	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 : */