projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
write_riemann: send notification message to riemann via description field
[collectd.git]
/
src
/
nginx.c
diff --git
a/src/nginx.c
b/src/nginx.c
index
cea3c84
..
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>
**/
@@
-38,10
+38,9
@@
static char *cacert = NULL;
static CURL *curl = NULL;
static CURL *curl = NULL;
-#define ABUFFER_SIZE 16384
-static char nginx_buffer[ABUFFER_SIZE];
-static int nginx_buffer_len = 0;
-static char nginx_curl_error[CURL_ERROR_SIZE];
+static char nginx_buffer[16384];
+static size_t nginx_buffer_len = 0;
+static char nginx_curl_error[CURL_ERROR_SIZE];
static const char *config_keys[] =
{
static const char *config_keys[] =
{
@@
-59,17
+58,19
@@
static size_t nginx_curl_callback (void *buf, size_t size, size_t nmemb,
{
size_t len = size * nmemb;
{
size_t len = size * nmemb;
- if ((nginx_buffer_len + len) >= ABUFFER_SIZE)
+ /* Check if the data fits into the memory. If not, truncate it. */
+ if ((nginx_buffer_len + len) >= sizeof (nginx_buffer))
{
{
- len = (ABUFFER_SIZE - 1) - nginx_buffer_len;
+ assert (sizeof (nginx_buffer) > nginx_buffer_len);
+ len = (sizeof (nginx_buffer) - 1) - nginx_buffer_len;
}
if (len <= 0)
return (len);
}
if (len <= 0)
return (len);
- memcpy (
nginx_buffer + nginx_buffer_len, (char *)
buf, len);
+ memcpy (
&nginx_buffer[nginx_buffer_len],
buf, len);
nginx_buffer_len += len;
nginx_buffer_len += len;
- nginx_buffer[nginx_buffer_len] =
'\0'
;
+ nginx_buffer[nginx_buffer_len] =
0
;
return (len);
}
return (len);
}
@@
-119,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)
@@
-141,22
+143,25
@@
static int init (void)
curl_easy_setopt (curl, CURLOPT_URL, url);
}
curl_easy_setopt (curl, CURLOPT_URL, url);
}
- if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0))
+ curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1L);
+ curl_easy_setopt (curl, CURLOPT_MAXREDIRS, 50L);
+
+ 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) ||
(strcmp (verify_host, "true") == 0
))
+ 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)
@@
-175,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;
@@
-210,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);
@@
-249,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]));
}
}