X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapcups.c;h=62c7a3c404844dcc1b8f9d66d2bdf72c7b75c32d;hb=e4b274ed754af52196d3390b8ce101a7f94e318a;hp=9fab78587440e961d33387372b4f2dc84e762bfe;hpb=da724d1a59236efa7d6845465a0fa4dfba57d8ab;p=collectd.git

diff --git a/src/apcups.c b/src/apcups.c
index 9fab7858..62c7a3c4 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 <tonyabg at charter.net>
  * Copyright (C) 2000-2004 Kern Sibbald
  * Copyright (C) 1996-99 Andre M. Hedrick <andre at suse.com>
  *
+ *
  * 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 <sys/types.h>
@@ -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));
@@ -187,7 +135,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 +155,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 +166,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 +201,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);
 	}
 
@@ -333,7 +287,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);
 	}
 
@@ -379,7 +333,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 +357,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;
@@ -470,7 +424,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 +439,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 */