X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Futils_cmd_flush.c;h=3584f3b71a3c82bd73ec85cd55201422f8a8e1f8;hb=77311aed583ac4566d76f1ce3a1dc9deae2e59dc;hp=74807b84395901d44935cdab9760edd740cdf2f7;hpb=0f77b589fdee440b959887673c3cd6ed244c215a;p=collectd.git

diff --git a/src/utils_cmd_flush.c b/src/utils_cmd_flush.c
index 74807b84..3584f3b7 100644
--- a/src/utils_cmd_flush.c
+++ b/src/utils_cmd_flush.c
@@ -54,7 +54,7 @@ int handle_flush (FILE *fh, char *buffer)
 	int success = 0;
 	int error   = 0;
 
-	int timeout = -1;
+	double timeout = 0.0;
 	char **plugins = NULL;
 	int plugins_num = 0;
 	char **identifiers = NULL;
@@ -106,9 +106,9 @@ int handle_flush (FILE *fh, char *buffer)
 			
 			errno = 0;
 			endptr = NULL;
-			timeout = strtol (opt_value, &endptr, 0);
+			timeout = strtod (opt_value, &endptr);
 
-			if ((endptr == opt_value) || (errno != 0))
+			if ((endptr == opt_value) || (errno != 0) || (!isfinite (timeout)))
 			{
 				print_to_socket (fh, "-1 Invalid value for option `timeout': "
 						"%s\n", opt_value);
@@ -116,8 +116,10 @@ int handle_flush (FILE *fh, char *buffer)
 				sfree (identifiers);
 				return (-1);
 			}
-			else if (timeout <= 0)
-				timeout = -1;
+			else if (timeout < 0.0)
+			{
+				timeout = 0.0;
+			}
 		}
 		else
 		{
@@ -149,7 +151,9 @@ int handle_flush (FILE *fh, char *buffer)
 			int status;
 
 			identifier = identifiers[j];
-			status = plugin_flush (plugin, timeout, identifier);
+			status = plugin_flush (plugin,
+					DOUBLE_TO_CDTIME_T (timeout),
+					identifier);
 			if (status == 0)
 				success++;
 			else
@@ -164,7 +168,7 @@ int handle_flush (FILE *fh, char *buffer)
 	}
 	else
 	{
-		plugin_flush_all (timeout);
+		plugin_flush (NULL, timeout, NULL);
 		print_to_socket (fh, "0 Done\n");
 	}