Various plugins: Set the cURL option "CURLOPT_NOSIGNAL".

[collectd.git] / src / apache.c

diff --git a/src/apache.c b/src/apache.c
index 69633d6..5f5441f 100644 (file)
--- a/src/apache.c
+++ b/src/apache.c
@@ -37,7 +37,6 @@ enum server_enum
        LIGHTTPD
 };
 
-
 struct apache_s
 {
        int server_type;
@@ -49,7 +48,7 @@ struct apache_s
        int   verify_peer;
        int   verify_host;
        char *cacert;
-       char *server; // user specific server type
+       char *server; /* user specific server type */
        char *apache_buffer;
        char apache_curl_error[CURL_ERROR_SIZE];
        size_t apache_buffer_size;
@@ -135,15 +134,25 @@ static size_t apache_header_callback (void *buf, size_t size, size_t nmemb,
        }
 
        if (len <= 0)
-               return len;
+               return (len);
+
+       /* look for the Server header */
+       if (strncasecmp (buf, "Server: ", strlen ("Server: ")) != 0)
+               return (len);
 
-       // look for the Server header
-       if ((strstr(buf, "Server: ") != NULL) &&
-                       (strstr(buf, "lighttpd") != NULL)) {
+       if (strstr (buf, "Apache") != NULL)
+               st->server_type = APACHE;
+       else if (strstr (buf, "lighttpd") != NULL)
                st->server_type = LIGHTTPD;
+       else
+       {
+               const char *hdr = buf;
+
+               hdr += strlen ("Server: ");
+               NOTICE ("apache plugin: Unknown server software: %s", hdr);
        }
 
-       return len;
+       return (len);
 } /* apache_header_callback */
 
 /* Configuration handling functiions
@@ -193,7 +202,7 @@ static int config_set_boolean (int *ret_boolean, /* {{{ */
                return (-1);
        }
 
-       if (ci->values[0].type != OCONFIG_TYPE_BOOLEAN)
+       if (ci->values[0].type == OCONFIG_TYPE_BOOLEAN)
        {
                if (ci->values[0].value.boolean)
                        *ret_boolean = 1;
@@ -203,13 +212,9 @@ static int config_set_boolean (int *ret_boolean, /* {{{ */
        else /* if (ci->values[0].type != OCONFIG_TYPE_STRING) */
        {
                char *string = ci->values[0].value.string;
-               if ((strcasecmp ("true", string) == 0)
-                               || (strcasecmp ("yes", string) == 0)
-                               || (strcasecmp ("on", string) == 0))
+               if (IS_TRUE (string))
                        *ret_boolean = 1;
-               else if ((strcasecmp ("false", string) == 0)
-                               || (strcasecmp ("no", string) == 0)
-                               || (strcasecmp ("off", string) == 0))
+               else if (IS_FALSE (string))
                        *ret_boolean = 0;
                else
                {
@@ -308,7 +313,8 @@ static int config_add (oconfig_item_t *ci)
                                (st->host != NULL) ? st->host : hostname_g,
                                (st->name != NULL) ? st->name : "default"),
 
-               status = plugin_register_complex_read (callback_name,
+               status = plugin_register_complex_read (/* group = */ NULL,
+                               /* name      = */ callback_name,
                                /* callback  = */ apache_read_host,
                                /* interval  = */ NULL,
                                /* user_data = */ &ud);
@@ -400,22 +406,27 @@ static int init_host (apache_t *st) /* {{{ */
                return (-1);
        }
 
+       curl_easy_setopt (st->curl, CURLOPT_NOSIGNAL, 1);
        curl_easy_setopt (st->curl, CURLOPT_WRITEFUNCTION, apache_curl_callback);
        curl_easy_setopt (st->curl, CURLOPT_WRITEDATA, st);
 
-       st->server_type = -1; // not set as yet
-       // if the user specified string doesn't match apache or lighttpd, then
-       // ignore it. Headers will be parsed to find out the server type
+       /* not set as yet if the user specified string doesn't match apache or
+        * lighttpd, then ignore it. Headers will be parsed to find out the
+        * server type */
+       st->server_type = -1;
+
        if (st->server != NULL)
        {
                if (strcasecmp(st->server, "apache") == 0)
                        st->server_type = APACHE;
                else if (strcasecmp(st->server, "lighttpd") == 0)
                        st->server_type = LIGHTTPD;
+               else
+                       WARNING ("apache plugin: Unknown `Server' setting: %s",
+                                       st->server);
        }
 
-       // if not found register a header callback to determine the
-       // server_type
+       /* if not found register a header callback to determine the server_type */
        if (st->server_type == -1)
        {
                curl_easy_setopt (st->curl, CURLOPT_HEADERFUNCTION, apache_header_callback);
@@ -445,6 +456,7 @@ static int init_host (apache_t *st) /* {{{ */
        }
 
        curl_easy_setopt (st->curl, CURLOPT_URL, st->url);
+       curl_easy_setopt (st->curl, CURLOPT_FOLLOWLOCATION, 1);
 
        if (st->verify_peer != 0)
        {
@@ -583,7 +595,8 @@ static void submit_scoreboard (char *buf, apache_t *st)
                submit_gauge ("apache_scoreboard", "logging"  , logging, st);
                submit_gauge ("apache_scoreboard", "finishing", finishing, st);
                submit_gauge ("apache_scoreboard", "idle_cleanup", idle_cleanup, st);
-       } else
+       }
+       else
        {
                submit_gauge ("apache_scoreboard", "connect"       , open, st);
                submit_gauge ("apache_scoreboard", "close"         , closing, st);
@@ -636,9 +649,13 @@ static int apache_read_host (user_data_t *user_data) /* {{{ */
                return (-1);
        }
 
-       // fallback - server_type to apache if not set at this time
+       /* fallback - server_type to apache if not set at this time */
        if (st->server_type == -1)
+       {
+               WARNING ("apache plugin: Unable to determine server software "
+                               "automatically. Will assume Apache.");
                st->server_type = APACHE;
+       }
 
        ptr = st->apache_buffer;
        saveptr = NULL;
@@ -670,8 +687,12 @@ static int apache_read_host (user_data_t *user_data) /* {{{ */
                {
                        if (strcmp (fields[0], "Scoreboard:") == 0)
                                submit_scoreboard (fields[1], st);
-                       else if (strcmp (fields[0], "BusyServers:") == 0)
+                       else if ((strcmp (fields[0], "BusyServers:") == 0) /* Apache 1.* */
+                                       || (strcmp (fields[0], "BusyWorkers:") == 0) /* Apache 2.* */)
                                submit_gauge ("apache_connections", NULL, atol (fields[1]), st);
+                       else if ((strcmp (fields[0], "IdleServers:") == 0) /* Apache 1.x */
+                                       || (strcmp (fields[0], "IdleWorkers:") == 0) /* Apache 2.x */)
+                               submit_gauge ("apache_idle_workers", NULL, atol (fields[1]), st);
                }
        }