X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapcups.c;h=227c703c558fef41b8b338079c27321b281f5f48;hb=654783aed1fab02766a9cc036e859799e01f6f9e;hp=9fab78587440e961d33387372b4f2dc84e762bfe;hpb=d246967f9483c508549f1723ec977cc8a19dbd4c;p=collectd.git diff --git a/src/apcups.c b/src/apcups.c index 9fab7858..227c703c 100644 --- a/src/apcups.c +++ b/src/apcups.c @@ -1,9 +1,11 @@ /* * collectd - src/apcups.c + * Copyright (C) 2007 Florian octo Forster * Copyright (C) 2006 Anthony Gialluca * Copyright (C) 2000-2004 Kern Sibbald * Copyright (C) 1996-99 Andre M. Hedrick * + * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General * Public License as published by the Free Software Foundation. @@ -33,7 +35,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 @@ -79,59 +80,6 @@ static int conf_port = NISPORT; static int global_sockfd = -1; -/* - * The following are only if not compiled to test the module with its own main. -*/ -static data_source_t data_source_voltage[1] = -{ - {"value", DS_TYPE_GAUGE, NAN, NAN} -}; - -static data_set_t ds_voltage = -{ - "voltage", 1, data_source_voltage -}; - -static data_source_t data_source_percent[1] = -{ - {"percent", DS_TYPE_GAUGE, 0, 100.1} -}; - -static data_set_t ds_percent = -{ - "percent", 1, data_source_percent -}; - -static data_source_t data_source_timeleft[1] = -{ - {"timeleft", DS_TYPE_GAUGE, 0, 100.0} -}; - -static data_set_t ds_timeleft = -{ - "timeleft", 1, data_source_timeleft -}; - -static data_source_t data_source_temperature[1] = -{ - {"value", DS_TYPE_GAUGE, -273.15, NAN} -}; - -static data_set_t ds_temperature = -{ - "temperature", 1, data_source_temperature -}; - -static data_source_t data_source_frequency[1] = -{ - {"frequency", DS_TYPE_GAUGE, 0, NAN} -}; - -static data_set_t ds_frequency = -{ - "frequency", 1, data_source_frequency -}; - static const char *config_keys[] = { "Host", @@ -148,7 +96,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)); @@ -164,7 +112,7 @@ static int apcups_shutdown (void) * Returns -1 on error * Returns socket file descriptor otherwise */ -static int net_open (char *host, char *service, int port) +static int net_open (char *host, int port) { int sd; int status; @@ -176,8 +124,7 @@ static int net_open (char *host, char *service, int port) assert ((port > 0x00000000) && (port <= 0x0000FFFF)); /* Convert the port to a string */ - snprintf (port_str, 8, "%i", port); - port_str[7] = '\0'; + ssnprintf (port_str, sizeof (port_str), "%i", port); /* Resolve name */ memset ((void *) &ai_hints, '\0', sizeof (ai_hints)); @@ -187,7 +134,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]; + INFO ("getaddrinfo failed: %s", + (status == EAI_SYSTEM) + ? sstrerror (errno, errbuf, sizeof (errbuf)) + : gai_strerror (status)); return (-1); } @@ -203,7 +154,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 +165,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]; + INFO ("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 +200,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); } @@ -308,8 +261,6 @@ static int apc_query_server (char *host, int port, char *key; double value; - static complain_t compl; - #if APCMAIN # define PRINT_VALUE(name, val) printf(" Found property: name = %s; value = %f;\n", name, val) #else @@ -318,28 +269,24 @@ static int apc_query_server (char *host, int port, if (global_sockfd < 0) { - if ((global_sockfd = net_open (host, NULL, port)) < 0) + global_sockfd = net_open (host, port); + if (global_sockfd < 0) { - plugin_complain (LOG_ERR, &compl, "apcups plugin: " - "Connecting to the apcupsd failed."); + ERROR ("apcups plugin: Connecting to the " + "apcupsd failed."); return (-1); } - else - { - plugin_relief (LOG_NOTICE, &compl, "apcups plugin: " - "Connection re-established to the apcupsd."); - } } 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); } while ((n = net_recv (&global_sockfd, recvline, sizeof (recvline) - 1)) > 0) { - assert (n < sizeof (recvline)); + assert ((unsigned int)n < sizeof (recvline)); recvline[n] = '\0'; #if APCMAIN printf ("net_recv = `%s';\n", recvline); @@ -379,7 +326,7 @@ static int apc_query_server (char *host, int port, if (n < 0) { - syslog (LOG_WARNING, "apcups plugin: Error reading from socket"); + WARNING ("apcups plugin: Error reading from socket"); return (-1); } @@ -403,7 +350,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; @@ -425,24 +372,25 @@ 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_g); - strcpy (vl.plugin, "apcups"); - strcpy (vl.plugin_instance, ""); - strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance)); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "apcups", sizeof (vl.plugin)); + sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance)); + sstrncpy (vl.type, type, sizeof (vl.type)); + sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance)); - plugin_dispatch_values (type, &vl); + plugin_dispatch_values (&vl); } static void apc_submit (struct apc_detail_s *apcups_detail) { - apc_submit_generic ("apcups_voltage", "input", apcups_detail->linev); - apc_submit_generic ("apcups_voltage", "output", apcups_detail->outputv); - apc_submit_generic ("apcups_voltage", "battery", apcups_detail->battv); - apc_submit_generic ("apcups_charge", "", apcups_detail->bcharge); - apc_submit_generic ("apcups_charge_pct", "", apcups_detail->loadpct); - apc_submit_generic ("apcups_timeleft", "", apcups_detail->timeleft); - apc_submit_generic ("apcups_temp", "", apcups_detail->itemp); - apc_submit_generic ("apcups_frequency", "input", apcups_detail->linefreq); + apc_submit_generic ("voltage", "input", apcups_detail->linev); + apc_submit_generic ("voltage", "output", apcups_detail->outputv); + apc_submit_generic ("voltage", "battery", apcups_detail->battv); + apc_submit_generic ("charge", "", apcups_detail->bcharge); + apc_submit_generic ("percent", "load", apcups_detail->loadpct); + apc_submit_generic ("timeleft", "", apcups_detail->timeleft); + apc_submit_generic ("temperature", "", apcups_detail->itemp); + apc_submit_generic ("frequency", "input", apcups_detail->linefreq); } static int apcups_read (void) @@ -470,7 +418,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, @@ -485,14 +433,8 @@ static int apcups_read (void) void module_register (void) { - 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); - + 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 */