projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use parse_value in the conntrack plugin and submit the result even if it's zero
[collectd.git]
/
src
/
conntrack.c
diff --git
a/src/conntrack.c
b/src/conntrack.c
index
e70ff5f
..
4d67712
100644
(file)
--- a/
src/conntrack.c
+++ b/
src/conntrack.c
@@
-31,14
+31,11
@@
#define CONNTRACK_FILE "/proc/sys/net/netfilter/nf_conntrack_count"
#define CONNTRACK_FILE "/proc/sys/net/netfilter/nf_conntrack_count"
-static void conntrack_submit (
double
conntrack)
+static void conntrack_submit (
value_t
conntrack)
{
{
- value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
value_list_t vl = VALUE_LIST_INIT;
- values[0].gauge = conntrack;
-
- vl.values = values;
+ vl.values = &conntrack;
vl.values_len = 1;
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "conntrack", sizeof (vl.plugin));
vl.values_len = 1;
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "conntrack", sizeof (vl.plugin));
@@
-49,7
+46,7
@@
static void conntrack_submit (double conntrack)
static int conntrack_read (void)
{
static int conntrack_read (void)
{
-
double
conntrack;
+
value_t
conntrack;
FILE *fh;
char buffer[64];
FILE *fh;
char buffer[64];
@@
-64,10
+61,10
@@
static int conntrack_read (void)
}
fclose (fh);
}
fclose (fh);
- conntrack = atof (buffer);
+ if (parse_value (buffer, &conntrack, DS_TYPE_GAUGE) == -1)
+ return (-1);
- if (conntrack > 0.0)
- conntrack_submit (conntrack);
+ conntrack_submit (conntrack);
return (0);
} /* static int conntrack_read */
return (0);
} /* static int conntrack_read */