From: Florian Forster <octo@huhu.verplant.org>
Date: Thu, 25 Feb 2010 23:17:18 +0000 (+0100)
Subject: Merge branch 'collectd-4.9'
X-Git-Tag: collectd-4.10.0~62
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=67e4e517f58dac2a7b0e63b80256231480bfa59d

Merge branch 'collectd-4.9'
---

67e4e517f58dac2a7b0e63b80256231480bfa59d
diff --cc src/apache.c
index 1028f046,ad877b5f..39849e6e
--- a/src/apache.c
+++ b/src/apache.c
@@@ -685,11 -685,9 +685,12 @@@ static int apache_read_host (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);
  		}
  	}