nginx plugin: Report failed connections

[collectd.git] / src / nginx.c

diff --git a/src/nginx.c b/src/nginx.c
index 7587c1f..c03c67e 100644 (file)
--- a/src/nginx.c
+++ b/src/nginx.c
@@ -27,9 +27,9 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <curl/curl.h>
 
@@ -210,10 +210,8 @@ static void submit (const char *type, const char *inst, long long value)
     return;
 
   vl.values = values;
-  vl.values_len = 1;
-  sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+  vl.values_len = STATIC_ARRAY_SIZE (values);
   sstrncpy (vl.plugin, "nginx", sizeof (vl.plugin));
-  sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
   sstrncpy (vl.type, type, sizeof (vl.type));
 
   if (inst != NULL)
@@ -224,8 +222,6 @@ static void submit (const char *type, const char *inst, long long value)
 
 static int nginx_read (void)
 {
-  int i;
-
   char *ptr;
   char *lines[16];
   int   lines_num = 0;
@@ -260,10 +256,10 @@ static int nginx_read (void)
   /*
    * Active connections: 291
    * server accepts handled requests
-   *  16630948 16630948 31070465
+   *  101059015 100422216 347910649
    * Reading: 6 Writing: 179 Waiting: 106
    */
-  for (i = 0; i < lines_num; i++)
+  for (int i = 0; i < lines_num; i++)
   {
     fields_num = strsplit (lines[i], fields,
        (sizeof (fields) / sizeof (fields[0])));
@@ -281,6 +277,7 @@ static int nginx_read (void)
       {
        submit ("connections", "accepted", atoll (fields[0]));
        submit ("connections", "handled", atoll (fields[1]));
+       submit ("connections", "failed", (atoll(fields[0]) - atoll (fields[1])));
        submit ("nginx_requests", NULL, atoll (fields[2]));
       }
     }