From: Florian Forster <octo@huhu.verplant.org>
Date: Sat, 23 Jan 2010 12:19:49 +0000 (+0100)
Subject: apache plugin: Fix collection of the "apache_connections" value with Apache 2.*.
X-Git-Tag: collectd-4.8.4~31
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a62bc47e3bea0733c354976c17885e3f579a38c5;p=collectd.git

apache plugin: Fix collection of the "apache_connections" value with Apache 2.*.

Thanks to Gary (bug tracker) for pointing this out :)
---

diff --git a/src/apache.c b/src/apache.c
index a333bf2b..ebf245c4 100644
--- a/src/apache.c
+++ b/src/apache.c
@@ -689,7 +689,8 @@ 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);
 		}
 	}