};
static int bvolt_ds_num = 1;
-static char *load_file_template = "apcups/charge_percent.rrd";
+static char *load_file_template = "apcups/load_percent.rrd";
static char *load_ds_def[] =
{
"DS:percent:GAUGE:"COLLECTD_HEARTBEAT":0:110",
};
static int load_ds_num = 1;
-static char *charge_file_template = "apcups/charge.rrd";
+static char *charge_file_template = "apcups/charge_percent.rrd";
static char *charge_ds_def[] =
{
- "DS:charge:GAUGE:"COLLECTD_HEARTBEAT":0:U",
+ "DS:percent:GAUGE:"COLLECTD_HEARTBEAT":0:110",
};
static int charge_ds_num = 1;
static char *temp_ds_def[] =
{
/* -273.15 is absolute zero */
- "DS:temperature:GAUGE:"COLLECTD_HEARTBEAT":-274:U",
+ "DS:value:GAUGE:"COLLECTD_HEARTBEAT":-274:U",
};
static int temp_ds_num = 1;
#define BIG_BUF 4096
-/*
- * Read nbytes from the network.
- * It is possible that the total bytes require in several
- * read requests
- */
-static int read_nbytes (int *fd, char *ptr, int nbytes)
-{
- int nleft;
- int nread;
-
- nleft = nbytes;
- nread = -1;
-
- assert (*fd >= 0);
-
- while ((nleft > 0) && (nread != 0))
- {
- nread = read (*fd, ptr, nleft);
-
- if (nread == -1 && (errno == EINTR || errno == EAGAIN))
- continue;
-
- if (nread == -1)
- {
- *fd = -1;
- syslog (LOG_ERR, "apcups plugin: write failed: %s", strerror (errno));
- return (-1);
- }
-
- nleft -= nread;
- ptr += nread;
- }
-
- return (nbytes - nleft);
-}
-
-/*
- * Write nbytes to the network.
- * It may require several writes.
- */
-static int write_nbytes (int *fd, void *buf, int buflen)
-{
- int nleft;
- int nwritten;
- char *ptr;
-
- assert (buflen > 0);
- assert (*fd >= 0);
-
- ptr = (char *) buf;
-
- nleft = buflen;
- while (nleft > 0)
- {
- nwritten = write (*fd, ptr, nleft);
-
- if ((nwritten == -1) && ((errno == EAGAIN) || (errno == EINTR)))
- continue;
-
- if (nwritten == -1)
- {
- syslog (LOG_ERR, "Writing to socket failed: %s", strerror (errno));
- *fd = -1;
- return (-1);
- }
-
- nleft -= nwritten;
- ptr += nwritten;
- }
-
- /* If we get here, (nleft <= 0) is true */
- return (buflen);
-}
-
+#if APCMAIN
/* Close the network connection */
static void net_close (int *fd)
{
- short pktsiz = 0;
+ uint16_t packet_size = 0;
assert (*fd >= 0);
+ DBG ("Gracefully shutting down socket %i.", *fd);
+
/* send EOF sentinel */
- write_nbytes (fd, &pktsiz, sizeof (short));
+ swrite (*fd, (void *) &packet_size, sizeof (packet_size));
close (*fd);
*fd = -1;
}
-
+#endif /* APCMAIN */
/*
* Open a TCP connection to the UPS network server
if (status != 0) /* `connect(2)' failed */
{
DBG ("connect failed: %s", strerror (errno));
+ close (sd);
return (-1);
}
- DBG ("Done opening a socket: %i", sd);
+ DBG ("Done opening a socket %i", sd);
return (sd);
} /* int net_open (char *host, char *service, int port) */
*/
static int net_recv (int *sockfd, char *buf, int buflen)
{
- int nbytes;
- short pktsiz;
+ uint16_t packet_size;
/* get data size -- in short */
- if ((nbytes = read_nbytes (sockfd, (char *) &pktsiz, sizeof (short))) <= 0)
+ if (sread (*sockfd, (void *) &packet_size, sizeof (packet_size)) != 0)
+ {
+ *sockfd = -1;
return (-1);
+ }
- if (nbytes != sizeof (short))
- return (-2);
-
- pktsiz = ntohs (pktsiz);
- if (pktsiz > buflen)
+ packet_size = ntohs (packet_size);
+ if (packet_size > buflen)
{
DBG ("record length too large");
return (-2);
}
- if (pktsiz == 0)
+ if (packet_size == 0)
return (0);
/* now read the actual data */
- if ((nbytes = read_nbytes (sockfd, buf, pktsiz)) <= 0)
- return (-2);
-
- if (nbytes != pktsiz)
- return (-2);
+ if (sread (*sockfd, (void *) buf, packet_size) != 0)
+ {
+ *sockfd = -1;
+ return (-1);
+ }
- return (nbytes);
-} /* static int net_recv (int sockfd, char *buf, int buflen) */
+ return ((int) packet_size);
+} /* static int net_recv (int *sockfd, char *buf, int buflen) */
/*
* Send a message over the network. The send consists of
*/
static int net_send (int *sockfd, char *buff, int len)
{
- int rc;
- short packet_size;
+ uint16_t packet_size;
assert (len > 0);
+ assert (*sockfd >= 0);
/* send short containing size of data packet */
- packet_size = htons ((short) len);
+ packet_size = htons ((uint16_t) len);
- rc = write_nbytes (sockfd, &packet_size, sizeof (packet_size));
- if (rc != sizeof (packet_size))
+ if (swrite (*sockfd, (void *) &packet_size, sizeof (packet_size)) != 0)
+ {
+ *sockfd = -1;
return (-1);
+ }
/* send data packet */
- rc = write_nbytes (sockfd, buff, len);
- if (rc != len)
- return (-1);
+ if (swrite (*sockfd, (void *) buff, len) != 0)
+ {
+ *sockfd = -1;
+ return (-2);
+ }
return (0);
}
double value;
static int sockfd = -1;
- static unsigned int complain = 0;
+ static complain_t compl;
#if APCMAIN
# define PRINT_VALUE(name, val) printf(" Found property: name = %s; value = %f;\n", name, val)
{
if ((sockfd = net_open (host, NULL, port)) < 0)
{
- /* Complain once every six hours. */
- int complain_step = 21600 / atoi (COLLECTD_STEP);
-
- if ((complain % complain_step) == 0)
- syslog (LOG_ERR, "apcups plugin: Connecting to the apcupsd failed.");
- complain++;
-
+ plugin_complain (LOG_ERR, &compl, "apcups plugin: "
+ "Connecting to the apcupsd failed.");
return (-1);
}
- else if (complain > 1)
+ else
{
- syslog (LOG_NOTICE, "apcups plugin: Connection re-established to the apcupsd.");
- complain = 0;
+ plugin_relief (LOG_NOTICE, &compl, "apcups plugin: "
+ "Connection re-established to the apcupsd.");
}
}
value = atof (tokptr);
PRINT_VALUE (key, value);
- DBG ("key = %s; value = %f;", key, value);
if (strcmp ("LINEV", key) == 0)
apcups_detail->linev = value;
{
syslog (LOG_WARNING, "apcups plugin: Error reading from socket");
return (-1);
- } else {
+ }
+#if APCMAIN
+ else
+ {
/* close the opened socket */
- net_close(&sockfd);
+ net_close (&sockfd);
}
+#endif /* APCMAIN */
return (0);
}
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);
+ /* `apcups_charge_pct' actually is the wrong name, but we keep it that
+ * way for backwards compatibility. */
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);
plugin_register (MODULE_NAME, apcups_init, apcups_read, NULL);
plugin_register ("apcups_voltage", NULL, NULL, apc_write_voltage);
plugin_register ("apcups_charge", NULL, NULL, apc_write_charge);
+ /* `apcups_charge_pct' actually is the wrong name, but we keep it that
+ * way for backwards compatibility. */
plugin_register ("apcups_charge_pct", NULL, NULL, apc_write_percent);
plugin_register ("apcups_timeleft", NULL, NULL, apc_write_timeleft);
plugin_register ("apcups_temp", NULL, NULL, apc_write_temperature);
projects / collectd.git / blobdiff