X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconntrack.c;h=26f62786b242872dd89c4a943358f3d0164b2d45;hb=0a8741b9061f8df4a78a448c021612db06e17425;hp=49a33551d6ec4167adf9e74171092cb5cfd8a0f9;hpb=b81104a423234c04f0eb4ace0ec5e93a363c917a;p=collectd.git

diff --git a/src/conntrack.c b/src/conntrack.c
index 49a33551..26f62786 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -60,7 +61,6 @@ static void conntrack_submit (const char *type, const char *type_instance,
 
 	vl.values = &conntrack;
 	vl.values_len = 1;
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "conntrack", sizeof (vl.plugin));
 	sstrncpy (vl.type, type, sizeof (vl.type));
 	if (type_instance != NULL)
@@ -73,69 +73,33 @@ static void conntrack_submit (const char *type, const char *type_instance,
 static int conntrack_read (void)
 {
 	value_t conntrack, conntrack_max, conntrack_pct;
-	FILE *fh;
-	char buffer[64];
-	size_t buffer_len;
-
-	fh = fopen (old_files?CONNTRACK_FILE_OLD:CONNTRACK_FILE, "r");
-	if (fh == NULL)
-		return (-1);
 
-	memset (buffer, 0, sizeof (buffer));
-	if (fgets (buffer, sizeof (buffer), fh) == NULL)
+	char const *path = old_files ? CONNTRACK_FILE_OLD : CONNTRACK_FILE;
+	if (parse_value_file (path, &conntrack, DS_TYPE_GAUGE) != 0)
 	{
-		fclose (fh);
+		ERROR ("conntrack plugin: Reading \"%s\" failed.", path);
 		return (-1);
 	}
-	fclose (fh);
-
-	/* strip trailing newline. */
-	buffer_len = strlen (buffer);
-	while ((buffer_len > 0) && isspace ((int) buffer[buffer_len - 1]))
-	{
-		buffer[buffer_len - 1] = 0;
-		buffer_len--;
-	}
-
-	if (parse_value (buffer, &conntrack, DS_TYPE_GAUGE) != 0)
-		return (-1);
 
-	conntrack_submit ("conntrack", NULL, conntrack);
-
-	fh = fopen (old_files?CONNTRACK_MAX_FILE_OLD:CONNTRACK_MAX_FILE, "r");
-	if (fh == NULL)
-		return (-1);
-
-	memset (buffer, 0, sizeof (buffer));
-	if (fgets (buffer, sizeof (buffer), fh) == NULL)
+	path = old_files ? CONNTRACK_MAX_FILE_OLD : CONNTRACK_MAX_FILE;
+	if (parse_value_file (path, &conntrack_max, DS_TYPE_GAUGE) != 0)
 	{
-		fclose (fh);
+		ERROR ("conntrack plugin: Reading \"%s\" failed.", path);
 		return (-1);
 	}
-	fclose (fh);
-
-	/* strip trailing newline. */
-	buffer_len = strlen (buffer);
-	while ((buffer_len > 0) && isspace ((int) buffer[buffer_len - 1]))
-	{
-		buffer[buffer_len - 1] = 0;
-		buffer_len--;
-	}
-
-	if (parse_value (buffer, &conntrack_max, DS_TYPE_GAUGE) != 0)
-		return (-1);
 
-	conntrack_submit ("conntrack", "max", conntrack_max);
 	conntrack_pct.gauge = (conntrack.gauge / conntrack_max.gauge) * 100;
-	conntrack_submit ("percent", "used", conntrack_pct);
 
+	conntrack_submit ("conntrack", NULL,   conntrack);
+	conntrack_submit ("conntrack", "max",  conntrack_max);
+	conntrack_submit ("percent",   "used", conntrack_pct);
 
 	return (0);
 } /* static int conntrack_read */
 
 void module_register (void)
 {
-    plugin_register_config ("conntrack", conntrack_config,
+	plugin_register_config ("conntrack", conntrack_config,
                             config_keys, config_keys_num);
 	plugin_register_read ("conntrack", conntrack_read);
 } /* void module_register */