X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flogfile.c;h=7b96ac57fcb21130a42a74e5342303503c2a88aa;hb=77f4a7f72ac4db1a7cb6b4da612211f2fdd93bfb;hp=00dc030e38507050d784cb054629f2f4534b6020;hpb=79b07973208a37d18818541ed6dcdaac8dc35e0f;p=collectd.git

diff --git a/src/logfile.c b/src/logfile.c
index 00dc030e..7b96ac57 100644
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -1,6 +1,7 @@
 /**
  * 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
@@ -73,9 +74,7 @@ static int logfile_config (const char *key, const char *value)
 		log_file = strdup (value);
 	}
 	else if (0 == strcasecmp (key, "Timestamp")) {
-		if ((strcasecmp (value, "false") == 0)
-				|| (strcasecmp (value, "no") == 0)
-				|| (strcasecmp (value, "off") == 0))
+		if (IS_FALSE (value))
 			print_timestamp = 0;
 		else
 			print_timestamp = 1;
@@ -142,7 +141,8 @@ static void logfile_print (const char *msg, time_t timestamp_time)
 	return;
 } /* void logfile_print */
 
-static void logfile_log (int severity, const char *msg)
+static void logfile_log (int severity, const char *msg,
+		user_data_t __attribute__((unused)) *user_data)
 {
 	if (severity > log_level)
 		return;
@@ -150,20 +150,43 @@ static void logfile_log (int severity, const char *msg)
 	logfile_print (msg, time (NULL));
 } /* void logfile_log (int, const char *) */
 
-int logfile_notification (const notification_t *n)
+static int logfile_notification (const notification_t *n,
+		user_data_t __attribute__((unused)) *user_data)
 {
-	char msg[1024] = "";
+	char  buf[1024] = "";
+	char *buf_ptr = buf;
+	int   buf_len = sizeof (buf);
 	int status;
 
-	status = snprintf (msg, sizeof (msg), "Notification: %s: message = %s, "
-			"host = %s",
+	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")),
-			n->message, n->host);
-	msg[sizeof (msg) - 1] = '\0';
+				: ((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 (msg, n->time);
+	logfile_print (buf,
+			(n->time > 0) ? n->time : time (NULL));
 
 	return (0);
 } /* int logfile_notification */
@@ -172,8 +195,9 @@ 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);
+	plugin_register_log ("logfile", logfile_log, /* user_data = */ NULL);
+	plugin_register_notification ("logfile", logfile_notification,
+			/* user_data = */ NULL);
 } /* void module_register (void) */
 
 /* vim: set sw=4 ts=4 tw=78 noexpandtab : */