X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Flogfile.c;h=911d14d2fb21d21f7c27b397c6e9d59844b05f3e;hb=107a919d0d15d51d774c92ac72879d869e0fa4ee;hp=2b546ac07bfc8c0a116730a455b357d399695a3e;hpb=0b88f6888705e92ce4472435a464730cf2ce2d5a;p=collectd.git

diff --git a/src/logfile.c b/src/logfile.c
index 2b546ac0..911d14d2 100644
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -27,6 +27,8 @@
 
 #include <pthread.h>
 
+#define DEFAULT_LOGFILE LOCALSTATEDIR"/log/collectd.log"
+
 #if COLLECT_DEBUG
 static int log_level = LOG_DEBUG;
 #else
@@ -85,20 +87,15 @@ static int logfile_config (const char *key, const char *value)
 	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;
-	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 (&timestamp_time, &timestamp_tm);
 
 		strftime (timestamp_str, sizeof (timestamp_str), "%Y-%m-%d %H:%M:%S",
@@ -108,7 +105,12 @@ static void logfile_log (int severity, const char *msg)
 
 	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;
@@ -122,7 +124,7 @@ static void logfile_log (int severity, const char *msg)
 	{
 			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
@@ -139,13 +141,40 @@ static void logfile_log (int severity, const char *msg)
 	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 : */