Merge remote-tracking branch 'github/pr/387'

[collectd.git] / src / syslog.c

diff --git a/src/syslog.c b/src/syslog.c
index fc34e56c29cc6d00b4f953a2550139ca611df20f..4f5d0c4a2b84c6ebf20349c7247bdc9b26456f44 100644 (file)
--- a/src/syslog.c
+++ b/src/syslog.c
@@ -33,7 +33,7 @@ static int log_level = LOG_DEBUG;
 #else
 static int log_level = LOG_INFO;
 #endif /* COLLECT_DEBUG */
-static int notif_severity = -1;
+static int notif_severity = 0;
 
 static const char *config_keys[] =
 {
@@ -47,11 +47,14 @@ static int sl_config (const char *key, const char *value)
        if (strcasecmp (key, "LogLevel") == 0)
        {
                log_level = parse_log_severity (value);
-               if (log_level == -1) return (1);
+               if (log_level < 0)
+                       return (1);
        }
        else if (strcasecmp (key, "NotifyLevel") == 0)
        {
-               notif_severity = parse_notif_severity(key);
+               notif_severity = parse_notif_severity (value);
+               if (notif_severity < 0)
+                       return (1);
        }
 
        return (0);
@@ -77,60 +80,63 @@ static int sl_notification (const notification_t *n,
                user_data_t __attribute__((unused)) *user_data)
 {
        char  buf[1024] = "";
-       char *buf_ptr = buf;
-       int   buf_len = sizeof (buf);
+       size_t offset = 0;
+       int log_severity;
+       char *severity_string;
        int status;
-       int severity;
-
-       /* do nothing if parsing of NotifSeverity failed */
-       if (notif_severity == -1)
-               return 0;
-       /* do nothing if NotifSeverity is higer than notification
-        * note that OKAY notifs will always be displayed */
-       if ((notif_severity == NOTIF_FAILURE) && (n -> severity == NOTIF_WARNING))
-               return 0;
-
-       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';
+       if (n->severity > notif_severity)
+               return (0);
 
        switch (n->severity)
        {
                case NOTIF_FAILURE:
-                       severity = LOG_ERR;
+                       severity_string = "FAILURE";
+                       log_severity = LOG_ERR;
                        break;
                case NOTIF_WARNING:
-                       severity = LOG_WARNING;
+                       severity_string = "WARNING";
+                       log_severity = LOG_WARNING;
                        break;
                case NOTIF_OKAY:
-                       severity = LOG_WARNING;
+                       severity_string = "OKAY";
+                       log_severity = LOG_NOTICE;
                        break;
-               default: severity = LOG_INFO;
+               default:
+                       severity_string = "UNKNOWN";
+                       log_severity = LOG_ERR;
        }
-       sl_log (severity, buf, NULL);
+
+#define BUFFER_ADD(...) do { \
+       status = ssnprintf (&buf[offset], sizeof (buf) - offset, \
+                       __VA_ARGS__); \
+       if (status < 1) \
+               return (-1); \
+       else if (((size_t) status) >= (sizeof (buf) - offset)) \
+               return (-ENOMEM); \
+       else \
+               offset += ((size_t) status); \
+} while (0)
+
+#define BUFFER_ADD_FIELD(field) do { \
+       if (n->field[0]) \
+               BUFFER_ADD (", " #field " = %s", n->field); \
+} while (0)
+
+       BUFFER_ADD ("Notification: severity = %s", severity_string);
+       BUFFER_ADD_FIELD (host);
+       BUFFER_ADD_FIELD (plugin);
+       BUFFER_ADD_FIELD (plugin_instance);
+       BUFFER_ADD_FIELD (type);
+       BUFFER_ADD_FIELD (type_instance);
+       BUFFER_ADD_FIELD (message);
+
+#undef BUFFER_ADD_FIELD
+#undef BUFFER_ADD
+
+       buf[sizeof (buf) - 1] = '\0';
+
+       sl_log (log_severity, buf, NULL);
 
        return (0);
 } /* int sl_notification */