X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcollectd.c;h=e13064771dcef9878bef79a3bf5bd289e4ded6ac;hb=803759e1ecb2b332ca9410785dd0d4b5771b7703;hp=98b9a1623f77b8840e6dbf36dbd7cfa4c69b2f1e;hpb=db71b0fa19cc0217f1460499f891a36ecc8f1c8e;p=collectd.git

diff --git a/src/collectd.c b/src/collectd.c
index 98b9a162..e1306477 100644
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -4,8 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * Free Software Foundation; only version 2 of the License is applicable.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -193,7 +192,7 @@ static int start_client (void)
 		curtime = time (NULL);
 
 		/* Issue all plugins */
-		plugin_read_all ();
+		plugin_read_all (&loop);
 
 		if (gettimeofday (&tv_now, NULL) < 0)
 		{
@@ -207,7 +206,7 @@ static int start_client (void)
 			continue;
 		}
 
-		while (nanosleep (&ts_wait, &ts_wait) == -1)
+		while ((loop == 0) && (nanosleep (&ts_wait, &ts_wait) == -1))
 		{
 			if (errno != EINTR)
 			{
@@ -223,16 +222,29 @@ static int start_client (void)
 #if HAVE_LIBRRD
 static int start_server (void)
 {
-	/* FIXME use stack here! */
+	/* FIXME */
+#if 0
 	char *host;
 	char *type;
 	char *instance;
 	char *values;
 
-	while (loop == 0)
+	int  error_counter = 0;
+	int  status;
+
+	while ((loop == 0) && (error_counter < 3))
 	{
-		if (network_receive (&host, &type, &instance, &values) == 0)
-			plugin_write (host, type, instance, values);
+		status = network_receive (&host, &type, &instance, &values);
+
+		if (status != 0)
+		{
+			if (status < 0)
+				error_counter++;
+			continue;
+		}
+		error_counter = 0;
+
+		plugin_write (host, type, instance, values);
 
 		if (host     != NULL) free (host);     host     = NULL;
 		if (type     != NULL) free (type);     type     = NULL;
@@ -240,6 +252,7 @@ static int start_server (void)
 		if (values   != NULL) free (values);   values   = NULL;
 	}
 	
+#endif
 	return (0);
 } /* static int start_server (void) */
 #endif /* HAVE_LIBRRD */
@@ -444,6 +457,8 @@ int main (int argc, char **argv)
 #endif
 		start_client ();
 
+	plugin_shutdown_all ();
+
 #if COLLECT_DEBUG
 	if (logfile != NULL)
 		DBG_STOPFILE("debug file closed.");