projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.8' into collectd-4.9
[collectd.git]
/
src
/
apache.c
diff --git
a/src/apache.c
b/src/apache.c
index
df1b560
..
ad877b5
100644
(file)
--- a/
src/apache.c
+++ b/
src/apache.c
@@
-202,7
+202,7
@@
static int config_set_boolean (int *ret_boolean, /* {{{ */
return (-1);
}
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;
{
if (ci->values[0].value.boolean)
*ret_boolean = 1;
@@
-685,7
+685,8
@@
static int apache_read_host (user_data_t *user_data) /* {{{ */
{
if (strcmp (fields[0], "Scoreboard:") == 0)
submit_scoreboard (fields[1], st);
{
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);
}
}
submit_gauge ("apache_connections", NULL, atol (fields[1]), st);
}
}