projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PATCH apache.c: support IBM HTTP Server.
[collectd.git]
/
src
/
apache.c
diff --git
a/src/apache.c
b/src/apache.c
index
371e1d4
..
80c66bf
100644
(file)
--- a/
src/apache.c
+++ b/
src/apache.c
@@
-144,6
+144,8
@@
static size_t apache_header_callback (void *buf, size_t size, size_t nmemb,
st->server_type = APACHE;
else if (strstr (buf, "lighttpd") != NULL)
st->server_type = LIGHTTPD;
st->server_type = APACHE;
else if (strstr (buf, "lighttpd") != NULL)
st->server_type = LIGHTTPD;
+ else if (strstr (buf, "IBM_HTTP_Server") != NULL)
+ st->server_type = APACHE;
else
{
const char *hdr = buf;
else
{
const char *hdr = buf;
@@
-202,7
+204,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;
@@
-212,13
+214,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;
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;
*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
{
*ret_boolean = 0;
else
{
@@
-317,7
+315,8
@@
static int config_add (oconfig_item_t *ci)
(st->host != NULL) ? st->host : hostname_g,
(st->name != NULL) ? st->name : "default"),
(st->host != NULL) ? st->host : hostname_g,
(st->name != NULL) ? st->name : "default"),
- status = plugin_register_complex_read (callback_name,
+ status = plugin_register_complex_read (/* group = */ NULL,
+ /* name = */ callback_name,
/* callback = */ apache_read_host,
/* interval = */ NULL,
/* user_data = */ &ud);
/* callback = */ apache_read_host,
/* interval = */ NULL,
/* user_data = */ &ud);
@@
-423,6
+422,8
@@
static int init_host (apache_t *st) /* {{{ */
st->server_type = APACHE;
else if (strcasecmp(st->server, "lighttpd") == 0)
st->server_type = LIGHTTPD;
st->server_type = APACHE;
else if (strcasecmp(st->server, "lighttpd") == 0)
st->server_type = LIGHTTPD;
+ else if (strcasecmp(st->server, "ibm_http_server") == 0)
+ st->server_type = APACHE;
else
WARNING ("apache plugin: Unknown `Server' setting: %s",
st->server);
else
WARNING ("apache plugin: Unknown `Server' setting: %s",
st->server);
@@
-458,6
+459,7
@@
static int init_host (apache_t *st) /* {{{ */
}
curl_easy_setopt (st->curl, CURLOPT_URL, st->url);
}
curl_easy_setopt (st->curl, CURLOPT_URL, st->url);
+ curl_easy_setopt (st->curl, CURLOPT_FOLLOWLOCATION, 1);
if (st->verify_peer != 0)
{
if (st->verify_peer != 0)
{
@@
-688,8
+690,12
@@
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);
+ 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);
}
}
}
}