X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_cmd_flush.c;h=087fee3d5c285f26f0ad2b44428c1d5e30d59fc4;hb=99eb08be924850cf76e3dece205d5cbf9c7d74c7;hp=6fa8b7bf00b5d0b68979b4e828e1f7093e32f5dc;hpb=d9ba7e3ed5d93e9abd34f961fff51676a096ac02;p=collectd.git

diff --git a/src/utils_cmd_flush.c b/src/utils_cmd_flush.c
index 6fa8b7bf..087fee3d 100644
--- a/src/utils_cmd_flush.c
+++ b/src/utils_cmd_flush.c
@@ -24,73 +24,132 @@
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
+#include "utils_parse_option.h"
+#include "utils_cmd_flush.h"
 
-#define print_to_socket(fh, ...) \
-	if (fprintf (fh, __VA_ARGS__) < 0) { \
-		char errbuf[1024]; \
-		WARNING ("handle_flush: failed to write to socket #%i: %s", \
-				fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
-		return -1; \
-	}
-
-int handle_flush (FILE *fh, char **fields, int fields_num)
+int handle_flush (FILE *fh, char *buffer)
 {
 	int success = 0;
 	int error   = 0;
 
-	int timeout = -1;
+	double timeout = 0.0;
+	char **plugins = NULL;
+	size_t plugins_num = 0;
+	char **identifiers = NULL;
+	size_t identifiers_num = 0;
+
+	size_t i;
+
+#define PRINT_TO_SOCK(fh, ...) \
+	do { \
+		if (fprintf (fh, __VA_ARGS__) < 0) { \
+			char errbuf[1024]; \
+			WARNING ("handle_flush: failed to write to socket #%i: %s", \
+					fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
+			strarray_free (plugins, plugins_num); \
+			strarray_free (identifiers, identifiers_num); \
+			return -1; \
+		} \
+		fflush(fh); \
+	} while (0)
 
-	int i;
+	if ((fh == NULL) || (buffer == NULL))
+		return (-1);
 
-	for (i = 1; i < fields_num; i++)
+	DEBUG ("utils_cmd_flush: handle_flush (fh = %p, buffer = %s);",
+			(void *) fh, buffer);
+
+	if (strncasecmp ("FLUSH", buffer, strlen ("FLUSH")) != 0)
 	{
-		char *option = fields[i];
-		int   status = 0;
+		PRINT_TO_SOCK (fh, "-1 Cannot parse command.\n");
+		return (-1);
+	}
+	buffer += strlen ("FLUSH");
 
-		if (strncasecmp ("plugin=", option, strlen ("plugin=")) == 0)
-		{
-			char *plugin = option + strlen ("plugin=");
+	while (*buffer != 0)
+	{
+		char *opt_key;
+		char *opt_value;
+		int status;
 
-			if (0 == plugin_flush_one (timeout, plugin))
-				++success;
-			else
-				++error;
+		opt_key = NULL;
+		opt_value = NULL;
+		status = parse_option (&buffer, &opt_key, &opt_value);
+		if (status != 0)
+		{
+			PRINT_TO_SOCK (fh, "-1 Parsing options failed.\n");
+			strarray_free (plugins, plugins_num);
+			strarray_free (identifiers, identifiers_num);
+			return (-1);
 		}
-		else if (strncasecmp ("timeout=", option, strlen ("timeout=")) == 0)
+
+		if (strcasecmp ("plugin", opt_key) == 0)
+			strarray_add (&plugins, &plugins_num, opt_value);
+		else if (strcasecmp ("identifier", opt_key) == 0)
+			strarray_add (&identifiers, &identifiers_num, opt_value);
+		else if (strcasecmp ("timeout", opt_key) == 0)
 		{
-			char *endptr = NULL;
-			char *value  = option + strlen ("timeout=");
+			char *endptr;
 
 			errno = 0;
-			timeout = strtol (value, &endptr, 0);
+			endptr = NULL;
+			timeout = strtod (opt_value, &endptr);
 
-			if ((endptr == value) || (0 != errno))
-				status = -1;
-			else if (0 >= timeout)
-				timeout = -1;
+			if ((endptr == opt_value) || (errno != 0) || (!isfinite (timeout)))
+			{
+				PRINT_TO_SOCK (fh, "-1 Invalid value for option `timeout': "
+						"%s\n", opt_value);
+				strarray_free (plugins, plugins_num);
+				strarray_free (identifiers, identifiers_num);
+				return (-1);
+			}
+			else if (timeout < 0.0)
+			{
+				timeout = 0.0;
+			}
 		}
 		else
-			status = -1;
-
-		if (status != 0)
 		{
-			print_to_socket (fh, "-1 Cannot parse option %s\n", option);
+			PRINT_TO_SOCK (fh, "-1 Cannot parse option %s\n", opt_key);
+			strarray_free (plugins, plugins_num);
+			strarray_free (identifiers, identifiers_num);
 			return (-1);
 		}
-	}
+	} /* while (*buffer != 0) */
 
-	if ((success + error) > 0)
+	for (i = 0; (i == 0) || (i < plugins_num); i++)
 	{
-		print_to_socket (fh, "0 Done: %i successful, %i errors\n",
-				success, error);
-	}
-	else
-	{
-		plugin_flush_all (timeout);
-		print_to_socket (fh, "0 Done\n");
+		char *plugin = NULL;
+		int j;
+
+		if (plugins_num != 0)
+			plugin = plugins[i];
+
+		for (j = 0; (j == 0) || (j < identifiers_num); j++)
+		{
+			char *identifier = NULL;
+			int status;
+
+			if (identifiers_num != 0)
+				identifier = identifiers[j];
+
+			status = plugin_flush (plugin,
+					DOUBLE_TO_CDTIME_T (timeout),
+					identifier);
+			if (status == 0)
+				success++;
+			else
+				error++;
+		}
 	}
 
+	PRINT_TO_SOCK (fh, "0 Done: %i successful, %i errors\n",
+			success, error);
+
+	strarray_free (plugins, plugins_num);
+	strarray_free (identifiers, identifiers_num);
 	return (0);
+#undef PRINT_TO_SOCK
 } /* int handle_flush */
 
 /* vim: set sw=4 ts=4 tw=78 noexpandtab : */