stderr plugin: Added "stderr" plugin to log to stderr.

This plugin is heavily based on Florian's syslog plugin.

Signed-off-by: Sebastian Harl <sh@tokkee.org>

diff --git a/configure.in b/configure.in
index ff12f6819fb7de627c842dc83f0848a427bedf97..a155d168c22f2736f35d01bbf15df8689ab4ccda 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1217,6 +1217,7 @@ AC_COLLECTD([ping],      [disable], [module], [ping statistics])
 AC_COLLECTD([processes], [disable], [module], [processes statistics])
 AC_COLLECTD([sensors],   [disable], [module], [lm_sensors statistics])
 AC_COLLECTD([serial],    [disable], [module], [serial statistics])
+AC_COLLECTD([stderr],    [disable], [module], [stderr log facility])
 AC_COLLECTD([swap],      [disable], [module], [swap statistics])
 AC_COLLECTD([syslog],    [disable], [module], [syslog log facility])
 AC_COLLECTD([tape],      [disable], [module], [tape statistics])
@@ -1279,6 +1280,7 @@ Configuration:
     processes . . . . . $enable_processes
     sensors . . . . . . $enable_sensors
     serial  . . . . . . $enable_serial
+    stderr  . . . . . . $enable_stderr
     swap  . . . . . . . $enable_swap
     syslog  . . . . . . $enable_syslog
     tape  . . . . . . . $enable_tape

diff --git a/src/Makefile.am b/src/Makefile.am
index adf83da6802e3399c16b167d3ac1a3aac2712412..707969a0a5e515049ff504b1ed0438a8b78ae810 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -432,6 +432,14 @@ swap_la_LDFLAGS += -lstatgrab
 endif
 endif
 
+if BUILD_MODULE_STDERR
+pkglib_LTLIBRARIES += stderr.la
+stderr_la_SOURCES = stderr.c
+stderr_la_LDFLAGS = -module -avoid-version
+collectd_LDADD += "-dlopen" stderr.la
+collectd_DEPENDENCIES += stderr.la
+endif
+
 if BUILD_MODULE_SYSLOG
 pkglib_LTLIBRARIES += syslog.la
 syslog_la_SOURCES = syslog.c

diff --git a/src/stderr.c b/src/stderr.c
new file mode 100644 (file)
index 0000000..30e50d9
--- /dev/null
+++ b/src/stderr.c
@@ -0,0 +1,83 @@
+/**
+ * collectd - src/stderr.c
+ * Copyright (C) 2007  Sebastian Harl
+ *
+ * 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
+ * Free Software Foundation; only version 2 of the License is applicable.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * Authors:
+ *   Sebastian Harl <sh at tokkee.org>
+ **/
+
+#include "collectd.h"
+#include "common.h"
+#include "plugin.h"
+
+#if COLLECT_DEBUG
+static int log_level = LOG_DEBUG;
+#else
+static int log_level = LOG_INFO;
+#endif /* COLLECT_DEBUG */
+
+static const char *config_keys[] =
+{
+       "LogLevel"
+};
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
+
+static int stderr_config (const char *key, const char *value)
+{
+       if (0 == strcasecmp (key, "LogLevel")) {
+               if ((0 == strcasecmp (value, "emerg"))
+                               || (0 == strcasecmp (value, "alert"))
+                               || (0 == strcasecmp (value, "crit"))
+                               || (0 == strcasecmp (value, "err")))
+                       log_level = LOG_ERR;
+               else if (0 == strcasecmp (value, "warning"))
+                       log_level = LOG_WARNING;
+               else if (0 == strcasecmp (value, "notice"))
+                       log_level = LOG_NOTICE;
+               else if (0 == strcasecmp (value, "info"))
+                       log_level = LOG_INFO;
+#if COLLECT_DEBUG
+               else if (0 == strcasecmp (value, "debug"))
+                       log_level = LOG_DEBUG;
+#endif /* COLLECT_DEBUG */
+               else
+                       return 1;
+       }
+       else {
+               return -1;
+       }
+       return 0;
+} /* int stderr_config (const char *, const char *) */
+
+static void stderr_log (int severity, const char *msg)
+{
+       if (severity > log_level)
+               return;
+
+       fprintf (stderr, "%s\n", msg);
+       return;
+} /* void stderr_log (int, const char *) */
+
+void module_register (void)
+{
+       plugin_register_config ("stderr", stderr_config,
+                       config_keys, config_keys_num);
+       plugin_register_log ("stderr", stderr_log);
+       return;
+} /* void module_register (void) */
+
+/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
+

diff --git a/src/syslog.c b/src/syslog.c
index bcf873e9e976c630110366a08928f5609d5522ba..9ad26085972a92142dffd22e032a53f345248b58 100644 (file)
--- a/src/syslog.c
+++ b/src/syslog.c
@@ -51,7 +51,7 @@ static int sl_config (const char *key, const char *value)
                        log_level = LOG_NOTICE;
                else if (strcasecmp (value, "info") == 0)
                        log_level = LOG_INFO;
-#if COLLECTD_DEBUG
+#if COLLECT_DEBUG
                else if (strcasecmp (value, "debug") == 0)
                        log_level = LOG_DEBUG;
 #endif