nut plugin: Added a plugin to query the `upsd' from the `network ups tools'.

[collectd.git] / src / hddtemp.c

diff --git a/src/hddtemp.c b/src/hddtemp.c
index 3f37d50..505d10f 100644 (file)
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -30,7 +30,6 @@
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
-#include "utils_debug.h"
 
 #if HAVE_NETDB_H && HAVE_SYS_SOCKET_H && HAVE_NETINET_IN_H \
        && HAVE_NETINET_TCP_H && HAVE_LIBGEN_H
@@ -134,9 +133,12 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 
        if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0)
        {
-               syslog (LOG_ERR, "hddtemp: getaddrinfo (%s, %s): %s",
+               char errbuf[1024];
+               ERROR ("hddtemp: getaddrinfo (%s, %s): %s",
                                host, port,
-                               ai_return == EAI_SYSTEM ? strerror (errno) : gai_strerror (ai_return));
+                               (ai_return == EAI_SYSTEM)
+                               ? sstrerror (errno, errbuf, sizeof (errbuf))
+                               : gai_strerror (ai_return));
                return (-1);
        }
 
@@ -146,16 +148,18 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
                /* create our socket descriptor */
                if ((fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol)) < 0)
                {
-                       syslog (LOG_ERR, "hddtemp: socket: %s",
-                                       strerror (errno));
+                       char errbuf[1024];
+                       ERROR ("hddtemp: socket: %s",
+                                       sstrerror (errno, errbuf, sizeof (errbuf)));
                        continue;
                }
 
                /* connect to the hddtemp daemon */
                if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr, ai_ptr->ai_addrlen))
                {
-                       DBG ("hddtemp: connect (%s, %s): %s", host, port,
-                                       strerror (errno));
+                       char errbuf[1024];
+                       DEBUG ("hddtemp: connect (%s, %s): %s", host, port,
+                                       sstrerror (errno, errbuf, sizeof (errbuf)));
                        close (fd);
                        fd = -1;
                        continue;
@@ -170,7 +174,7 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 
        if (fd < 0)
        {
-               syslog (LOG_ERR, "hddtemp: Could not connect to daemon.");
+               ERROR ("hddtemp: Could not connect to daemon.");
                return (-1);
        }
 
@@ -182,11 +186,13 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
        {
                if (status == -1)
                {
+                       char errbuf[1024];
+
                        if ((errno == EAGAIN) || (errno == EINTR))
                                continue;
 
-                       syslog (LOG_ERR, "hddtemp: Error reading from socket: %s",
-                                               strerror (errno));
+                       ERROR ("hddtemp: Error reading from socket: %s",
+                                       sstrerror (errno, errbuf, sizeof (errbuf)));
                        close (fd);
                        return (-1);
                }
@@ -199,11 +205,11 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
        if (buffer_fill >= buffer_size)
        {
                buffer[buffer_size - 1] = '\0';
-               syslog (LOG_WARNING, "hddtemp: Message from hddtemp has been truncated.");
+               WARNING ("hddtemp: Message from hddtemp has been truncated.");
        }
        else if (buffer_fill == 0)
        {
-               syslog (LOG_WARNING, "hddtemp: Peer has unexpectedly shut down the socket. "
+               WARNING ("hddtemp: Peer has unexpectedly shut down the socket. "
                                "Buffer: `%s'", buffer);
                close (fd);
                return (-1);
@@ -267,7 +273,7 @@ static int hddtemp_init (void)
 
        if ((fh = fopen ("/proc/partitions", "r")) != NULL)
        {
-               DBG ("Looking at /proc/partitions...");
+               DEBUG ("Looking at /proc/partitions...");
 
                while (fgets (buf, sizeof (buf), fh) != NULL)
                {
@@ -341,25 +347,25 @@ static int hddtemp_init (void)
 
                                /* Skip all other majors. */
                                default:
-                                       DBG ("Skipping unknown major %i", major);
+                                       DEBUG ("Skipping unknown major %i", major);
                                        continue;
                        } /* switch (major) */
 
                        if ((name = strdup (fields[3])) == NULL)
                        {
-                               syslog (LOG_ERR, "hddtemp: strdup(%s) == NULL", fields[3]);
+                               ERROR ("hddtemp: strdup(%s) == NULL", fields[3]);
                                continue;
                        }
 
                        if ((entry = (hddname_t *) malloc (sizeof (hddname_t))) == NULL)
                        {
-                               syslog (LOG_ERR, "hddtemp: malloc (%u) == NULL",
+                               ERROR ("hddtemp: malloc (%u) == NULL",
                                                (unsigned int) sizeof (hddname_t));
                                free (name);
                                continue;
                        }
 
-                       DBG ("Found disk: %s (%u:%u).", name, major, minor);
+                       DEBUG ("Found disk: %s (%u:%u).", name, major, minor);
 
                        entry->major = major;
                        entry->minor = minor;
@@ -378,9 +384,14 @@ static int hddtemp_init (void)
                }
                fclose (fh);
        }
+#if COLLECT_DEBUG
        else
-               DBG ("Could not open /proc/partitions: %s",
-                               strerror (errno));
+       {
+               char errbuf[1024];
+               DEBUG ("Could not open /proc/partitions: %s",
+                               sstrerror (errno, errbuf, sizeof (errbuf)));
+       }
+#endif /* COLLECT_DEBUG */
 #endif /* KERNEL_LINUX */
 
        return (0);
@@ -405,7 +416,7 @@ static char *hddtemp_get_name (char *drive)
 
        if (list == NULL)
        {
-               DBG ("Don't know %s, keeping name as-is.", drive);
+               DEBUG ("Don't know %s, keeping name as-is.", drive);
                return (strdup (drive));
        }
 
@@ -431,7 +442,7 @@ static void hddtemp_submit (char *type_instance, double value)
        vl.values = values;
        vl.values_len = 1;
        vl.time = time (NULL);
-       strcpy (vl.host, hostname);
+       strcpy (vl.host, hostname_g);
        strcpy (vl.plugin, "hddtemp");
        strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
@@ -443,6 +454,7 @@ static int hddtemp_read (void)
        char buf[1024];
        char *fields[128];
        char *ptr;
+       char *saveptr;
        int num_fields;
        int num_disks;
        int i;
@@ -451,10 +463,11 @@ static int hddtemp_read (void)
        if (hddtemp_query_daemon (buf, sizeof (buf)) < 0)
                return (-1);
 
-       /* NB: strtok will eat up "||" and leading "|"'s */
+       /* NB: strtok_r will eat up "||" and leading "|"'s */
        num_fields = 0;
        ptr = buf;
-       while ((fields[num_fields] = strtok (ptr, "|")) != NULL)
+       saveptr = NULL;
+       while ((fields[num_fields] = strtok_r (ptr, "|", &saveptr)) != NULL)
        {
                ptr = NULL;
                num_fields++;
@@ -501,14 +514,18 @@ static int hddtemp_read (void)
 
 /* module_register
    Register collectd plugin. */
-void module_register (void)
+void module_register (modreg_e load)
 {
-       plugin_register_data_set (&temperature_ds);
+       if (load & MR_DATASETS)
+               plugin_register_data_set (&temperature_ds);
        
 #if HDDTEMP_HAVE_READ
-       plugin_register_config ("hddtemp", hddtemp_config,
-                       config_keys, config_keys_num);
-       plugin_register_init ("hddtemp", hddtemp_init);
-       plugin_register_read ("hddtemp", hddtemp_read);
+       if (load & MR_READ)
+       {
+               plugin_register_config ("hddtemp", hddtemp_config,
+                               config_keys, config_keys_num);
+               plugin_register_init ("hddtemp", hddtemp_init);
+               plugin_register_read ("hddtemp", hddtemp_read);
+       }
 #endif /* HDDTEMP_HAVE_READ */
 }