perl plugin: Added "BaseName" config option.

[collectd.git] / src / irq.c

diff --git a/src/irq.c b/src/irq.c
index 6c30e95..3df9d86 100644 (file)
--- a/src/irq.c
+++ b/src/irq.c
@@ -25,8 +25,6 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#define MODULE_NAME "irq"
-
 #if KERNEL_LINUX
 # define IRQ_HAVE_READ 1
 #else
@@ -78,7 +76,7 @@ static int irq_config (const char *key, const char *value)
                if (temp == NULL)
                {
                        fprintf (stderr, "irq plugin: Cannot allocate more memory.\n");
-                       syslog (LOG_ERR, "irq plugin: Cannot allocate more memory.");
+                       ERROR ("irq plugin: Cannot allocate more memory.");
                        return (1);
                }
                irq_list = temp;
@@ -91,7 +89,7 @@ static int irq_config (const char *key, const char *value)
                {
                        fprintf (stderr, "irq plugin: Irq value is not a "
                                        "number: `%s'\n", value);
-                       syslog (LOG_ERR, "irq plugin: Irq value is not a "
+                       ERROR ("irq plugin: Irq value is not a "
                                        "number: `%s'", value);
                        return (1);
                }
@@ -178,8 +176,9 @@ static int irq_read (void)
 
        if ((fh = fopen ("/proc/interrupts", "r")) == NULL)
        {
-               syslog (LOG_WARNING, "irq plugin: fopen (/proc/interrupts): %s",
-                               strerror (errno));
+               char errbuf[1024];
+               WARNING ("irq plugin: fopen (/proc/interrupts): %s",
+                               sstrerror (errno, errbuf, sizeof (errbuf)));
                return (-1);
        }
        while (fgets (buffer, BUFSIZE, fh) != NULL)
@@ -215,16 +214,19 @@ static int irq_read (void)
 } /* int irq_read */
 #endif /* IRQ_HAVE_READ */
 
-void module_register (void)
+void module_register (modreg_e load)
 {
-       plugin_register_data_set (&ds_irq);
+       if (load & MR_DATASETS)
+               plugin_register_data_set (&ds_irq);
 
 #if IRQ_HAVE_READ
-       plugin_register_config ("irq", irq_config,
-                       config_keys, config_keys_num);
-       plugin_register_read ("irq", irq_read);
+       if (load & MR_READ)
+       {
+               plugin_register_config ("irq", irq_config,
+                               config_keys, config_keys_num);
+               plugin_register_read ("irq", irq_read);
+       }
 #endif /* IRQ_HAVE_READ */
-}
+} /* void module_register */
 
 #undef BUFSIZE
-#undef MODULE_NAME