X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapcups.c;h=a0629d5f6ae0a87e13b08f1e53f6d69b0c1a85f3;hb=6b89dd24f42ea2ee6ac5ce05a2fb3f18ea5331aa;hp=2539c32f5c308972c953f965fb2daf00ca60c628;hpb=dc80c73c20ef0e69c3850fd9679a827ad79e61a1;p=collectd.git diff --git a/src/apcups.c b/src/apcups.c index 2539c32f..a0629d5f 100644 --- a/src/apcups.c +++ b/src/apcups.c @@ -1,8 +1,9 @@ /* * collectd - src/apcups.c - * Copyright (C) 2006 Anthony Gialluca - * Copyright (C) 2000-2004 Kern Sibbald - * Copyright (C) 1996-99 Andre M. Hedrick + * Copyright (C) 2006-2007 Florian octo Forster + * Copyright (C) 2006 Anthony Gialluca + * Copyright (C) 2000-2004 Kern Sibbald + * Copyright (C) 1996-1999 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 @@ -20,15 +21,9 @@ * * Authors: * Anthony Gialluca + * Florian octo Forster **/ -/* - * FIXME: Don't know why but without this here atof() was not returning - * correct values for me. This is behavior that I don't understand and - * should be examined in closer detail. - */ -#include - #include "collectd.h" #include "common.h" /* rrd_update_file */ #include "plugin.h" /* plugin_register, plugin_submit */ @@ -78,59 +73,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", @@ -163,7 +105,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; @@ -175,8 +117,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 +128,7 @@ static int net_open (char *host, char *service, int port) if (status != 0) { char errbuf[1024]; - DEBUG ("getaddrinfo failed: %s", + INFO ("getaddrinfo failed: %s", (status == EAI_SYSTEM) ? sstrerror (errno, errbuf, sizeof (errbuf)) : gai_strerror (status)); @@ -218,7 +159,7 @@ static int net_open (char *host, char *service, int port) if (status != 0) /* `connect(2)' failed */ { char errbuf[1024]; - DEBUG ("connect failed: %s", + INFO ("connect failed: %s", sstrerror (errno, errbuf, sizeof (errbuf))); close (sd); return (-1); @@ -313,8 +254,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 @@ -323,17 +262,13 @@ 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) @@ -344,7 +279,7 @@ static int apc_query_server (char *host, int port, 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); @@ -429,25 +364,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) @@ -488,22 +423,10 @@ static int apcups_read (void) return (0); } /* apcups_read */ -void module_register (modreg_e load) +void module_register (void) { - 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); - } - - 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); - } + 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 */