Merge branch 'collectd-4.2' into collectd-4.3

[collectd.git] / src / apcups.c

diff --git a/src/apcups.c b/src/apcups.c
index 8f315c9..5a03764 100644 (file)
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -112,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;
@@ -136,7 +136,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));
@@ -167,7 +167,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);
@@ -262,8 +262,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
@@ -272,17 +270,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)
@@ -293,7 +287,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);
@@ -393,7 +387,7 @@ static void apc_submit (struct apc_detail_s *apcups_detail)
        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",    "charge",  apcups_detail->loadpct);
+       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);