X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnginx.c;h=de52262f4ec817b1b54ca876652b02e06a845252;hb=000a676164789647800cf6b265eb6b5e75bb9fdf;hp=b76f25b360ba6bf1771519f34f044c134ff98c32;hpb=99d7118d9ec6fd9b2907cef30bfa91c72b3a5826;p=collectd.git diff --git a/src/nginx.c b/src/nginx.c index b76f25b3..de52262f 100644 --- a/src/nginx.c +++ b/src/nginx.c @@ -144,6 +144,7 @@ static int init (void) } curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1L); + curl_easy_setopt (curl, CURLOPT_MAXREDIRS, 50L); if ((verify_peer == NULL) || IS_TRUE (verify_peer)) { @@ -180,6 +181,8 @@ static void submit (char *type, char *inst, long long value) values[0].gauge = value; else if (strcmp (type, "nginx_requests") == 0) values[0].derive = value; + else if (strcmp (type, "connections") == 0) + values[0].derive = value; else return; @@ -214,7 +217,7 @@ static int nginx_read (void) 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); @@ -253,6 +256,8 @@ static int nginx_read (void) && (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])); } }