X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapache.c;h=ad877b5ff67d10b999c67192730ca14c74b9f20f;hb=3bd6fcdfd20002eee1f1803460728449c0c98f86;hp=df1b560f092e89bbc8dd9cb65309fb55b20216f5;hpb=71cc6701e311071e1d9bfebbe53f9ac324cc7dfb;p=collectd.git diff --git a/src/apache.c b/src/apache.c index df1b560f..ad877b5f 100644 --- a/src/apache.c +++ b/src/apache.c @@ -202,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; @@ -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); - 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); } }