projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for custom attributes.
[collectd.git]
/
src
/
nginx.c
diff --git
a/src/nginx.c
b/src/nginx.c
index
36d3d8d
..
c356353
100644
(file)
--- a/
src/nginx.c
+++ b/
src/nginx.c
@@
-1,6
+1,6
@@
/**
* collectd - src/nginx.c
/**
* collectd - src/nginx.c
- * Copyright (C) 2006
,2007
Florian octo Forster
+ * Copyright (C) 2006
-2010
Florian octo Forster
* Copyright (C) 2008 Sebastian Harl
*
* This program is free software; you can redistribute it and/or modify it
* Copyright (C) 2008 Sebastian Harl
*
* This program is free software; you can redistribute it and/or modify it
@@
-18,7
+18,7
@@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
- * Florian octo Forster <octo at
verplant
.org>
+ * Florian octo Forster <octo at
collectd
.org>
* Sebastian Harl <sh at tokkee.org>
**/
* Sebastian Harl <sh at tokkee.org>
**/
@@
-120,8
+120,9
@@
static int init (void)
return (-1);
}
return (-1);
}
+ curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1L);
curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, nginx_curl_callback);
curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, nginx_curl_callback);
- curl_easy_setopt (curl, CURLOPT_USERAGENT,
PACKAGE_NAME"/"PACKAGE_VERSION
);
+ curl_easy_setopt (curl, CURLOPT_USERAGENT,
COLLECTD_USERAGENT
);
curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, nginx_curl_error);
if (user != NULL)
curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, nginx_curl_error);
if (user != NULL)
@@
-142,24
+143,25
@@
static int init (void)
curl_easy_setopt (curl, CURLOPT_URL, url);
}
curl_easy_setopt (curl, CURLOPT_URL, url);
}
- curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1);
+ curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1L);
+ curl_easy_setopt (curl, CURLOPT_MAXREDIRS, 50L);
if ((verify_peer == NULL) || IS_TRUE (verify_peer))
{
if ((verify_peer == NULL) || IS_TRUE (verify_peer))
{
- curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1);
+ curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1
L
);
}
else
{
}
else
{
- curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0);
+ curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0
L
);
}
if ((verify_host == NULL) || IS_TRUE (verify_host))
{
}
if ((verify_host == NULL) || IS_TRUE (verify_host))
{
- curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2);
+ curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2
L
);
}
else
{
}
else
{
- curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0);
+ curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0
L
);
}
if (cacert != NULL)
}
if (cacert != NULL)
@@
-178,7
+180,9
@@
static void submit (char *type, char *inst, long long value)
if (strcmp (type, "nginx_connections") == 0)
values[0].gauge = value;
else if (strcmp (type, "nginx_requests") == 0)
if (strcmp (type, "nginx_connections") == 0)
values[0].gauge = value;
else if (strcmp (type, "nginx_requests") == 0)
- values[0].counter = value;
+ values[0].derive = value;
+ else if (strcmp (type, "connections") == 0)
+ values[0].derive = value;
else
return;
else
return;
@@
-213,7
+217,7
@@
static int nginx_read (void)
return (-1);
nginx_buffer_len = 0;
return (-1);
nginx_buffer_len = 0;
- if (curl_easy_perform (curl) !=
0
)
+ if (curl_easy_perform (curl) !=
CURLE_OK
)
{
WARNING ("nginx plugin: curl_easy_perform failed: %s", nginx_curl_error);
return (-1);
{
WARNING ("nginx plugin: curl_easy_perform failed: %s", nginx_curl_error);
return (-1);
@@
-252,6
+256,8
@@
static int nginx_read (void)
&& (atoll (fields[1]) != 0)
&& (atoll (fields[2]) != 0))
{
&& (atoll (fields[1]) != 0)
&& (atoll (fields[2]) != 0))
{
+ submit ("connections", "accepted", atoll (fields[0]));
+ submit ("connections", "handled", atoll (fields[1]));
submit ("nginx_requests", NULL, atoll (fields[2]));
}
}
submit ("nginx_requests", NULL, atoll (fields[2]));
}
}