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

[collectd.git] / src / apcups.c

diff --git a/src/apcups.c b/src/apcups.c
index 1eddcd5..2539c32 100644 (file)
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -33,7 +33,6 @@
 #include "common.h"      /* rrd_update_file */
 #include "plugin.h"      /* plugin_register, plugin_submit */
 #include "configfile.h"  /* cf_register */
-#include "utils_debug.h"
 
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
@@ -84,7 +83,7 @@ static int global_sockfd = -1;
 */
 static data_source_t data_source_voltage[1] =
 {
-       {"voltage", DS_TYPE_GAUGE, NAN, NAN}
+       {"value", DS_TYPE_GAUGE, NAN, NAN}
 };
 
 static data_set_t ds_voltage =
@@ -148,7 +147,7 @@ static int apcups_shutdown (void)
        if (global_sockfd < 0)
                return (0);
 
-       DBG ("Gracefully shutting down socket %i.", global_sockfd);
+       DEBUG ("Gracefully shutting down socket %i.", global_sockfd);
 
        /* send EOF sentinel */
        swrite (global_sockfd, (void *) &packet_size, sizeof (packet_size));
@@ -187,7 +186,11 @@ static int net_open (char *host, char *service, int port)
        status = getaddrinfo (host, port_str, &ai_hints, &ai_return);
        if (status != 0)
        {
-               DBG ("getaddrinfo failed: %s", status == EAI_SYSTEM ? strerror (errno) : gai_strerror (status));
+               char errbuf[1024];
+               DEBUG ("getaddrinfo failed: %s",
+                               (status == EAI_SYSTEM)
+                               ? sstrerror (errno, errbuf, sizeof (errbuf))
+                               : gai_strerror (status));
                return (-1);
        }
 
@@ -203,7 +206,7 @@ static int net_open (char *host, char *service, int port)
 
        if (sd < 0)
        {
-               DBG ("Unable to open a socket");
+               DEBUG ("Unable to open a socket");
                freeaddrinfo (ai_return);
                return (-1);
        }
@@ -214,12 +217,14 @@ static int net_open (char *host, char *service, int port)
 
        if (status != 0) /* `connect(2)' failed */
        {
-               DBG ("connect failed: %s", strerror (errno));
+               char errbuf[1024];
+               DEBUG ("connect failed: %s",
+                               sstrerror (errno, errbuf, sizeof (errbuf)));
                close (sd);
                return (-1);
        }
 
-       DBG ("Done opening a socket %i", sd);
+       DEBUG ("Done opening a socket %i", sd);
 
        return (sd);
 } /* int net_open (char *host, char *service, int port) */
@@ -247,7 +252,7 @@ static int net_recv (int *sockfd, char *buf, int buflen)
        packet_size = ntohs (packet_size);
        if (packet_size > buflen)
        {
-               DBG ("record length too large");
+               DEBUG ("record length too large");
                return (-2);
        }
 
@@ -304,6 +309,7 @@ static int apc_query_server (char *host, int port,
        int     n;
        char    recvline[1024];
        char   *tokptr;
+       char   *toksaveptr;
        char   *key;
        double  value;
 
@@ -332,7 +338,7 @@ static int apc_query_server (char *host, int port,
 
        if (net_send (&global_sockfd, "status", 6) < 0)
        {
-               syslog (LOG_ERR, "apcups plugin: Writing to the socket failed.");
+               ERROR ("apcups plugin: Writing to the socket failed.");
                return (-1);
        }
 
@@ -344,11 +350,12 @@ static int apc_query_server (char *host, int port,
                printf ("net_recv = `%s';\n", recvline);
 #endif /* if APCMAIN */
 
-               tokptr = strtok (recvline, " :\t");
+               toksaveptr = NULL;
+               tokptr = strtok_r (recvline, " :\t", &toksaveptr);
                while (tokptr != NULL)
                {
                        key = tokptr;
-                       if ((tokptr = strtok (NULL, " :\t")) == NULL)
+                       if ((tokptr = strtok_r (NULL, " :\t", &toksaveptr)) == NULL)
                                continue;
                        value = atof (tokptr);
 
@@ -371,13 +378,13 @@ static int apc_query_server (char *host, int port,
                        else if (strcmp ("TIMELEFT", key) == 0)
                                apcups_detail->timeleft = value;
 
-                       tokptr = strtok (NULL, ":");
+                       tokptr = strtok_r (NULL, ":", &toksaveptr);
                } /* while (tokptr != NULL) */
        }
        
        if (n < 0)
        {
-               syslog (LOG_WARNING, "apcups plugin: Error reading from socket");
+               WARNING ("apcups plugin: Error reading from socket");
                return (-1);
        }
 
@@ -401,7 +408,7 @@ static int apcups_config (const char *key, const char *value)
                int port_tmp = atoi (value);
                if (port_tmp < 1 || port_tmp > 65535)
                {
-                       syslog (LOG_WARNING, "apcups plugin: Invalid port: %i", port_tmp);
+                       WARNING ("apcups plugin: Invalid port: %i", port_tmp);
                        return (1);
                }
                conf_port = port_tmp;
@@ -423,7 +430,7 @@ static void apc_submit_generic (char *type, char *type_inst, 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, "apcups");
        strcpy (vl.plugin_instance, "");
        strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
@@ -468,7 +475,7 @@ static int apcups_read (void)
         */
        if (status != 0)
        {
-               DBG ("apc_query_server (%s, %i) = %i",
+               DEBUG ("apc_query_server (%s, %i) = %i",
                                conf_host == NULL
                                ? APCUPS_DEFAULT_HOST
                                : conf_host,
@@ -481,16 +488,22 @@ static int apcups_read (void)
        return (0);
 } /* apcups_read */
 
-void module_register (void)
+void module_register (modreg_e load)
 {
-       plugin_register_data_set (&ds_voltage);
-       plugin_register_data_set (&ds_percent);
-       plugin_register_data_set (&ds_timeleft);
-       plugin_register_data_set (&ds_temperature);
-       plugin_register_data_set (&ds_frequency);
-
-       plugin_register_config ("apcups", apcups_config, config_keys, config_keys_num);
+       if (load & MR_DATASETS)
+       {
+               plugin_register_data_set (&ds_voltage);
+               plugin_register_data_set (&ds_percent);
+               plugin_register_data_set (&ds_timeleft);
+               plugin_register_data_set (&ds_temperature);
+               plugin_register_data_set (&ds_frequency);
+       }
 
-       plugin_register_read ("apcups", apcups_read);
-       plugin_register_shutdown ("apcups", apcups_shutdown);
-}
+       if (load & MR_READ)
+       {
+               plugin_register_config ("apcups", apcups_config, config_keys,
+                               config_keys_num);
+               plugin_register_read ("apcups", apcups_read);
+               plugin_register_shutdown ("apcups", apcups_shutdown);
+       }
+} /* void module_register */