X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapache.c;h=d6712dcb7885748be6725dcbe8793873ecd0e8b2;hb=6254a76;hp=69633d6fb760f26457f9fc42e0aa2a0278c465ac;hpb=b046582ac6fd2392a8971c95d71d85ee229277e0;p=collectd.git

diff --git a/src/apache.c b/src/apache.c
index 69633d6f..d6712dcb 100644
--- 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
 		{
@@ -403,19 +408,23 @@ static int init_host (apache_t *st) /* {{{ */
 	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 +454,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 +593,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 +647,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;