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

diff --git a/src/collectd.c b/src/collectd.c
index 28a8a1eb..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
@@ -123,6 +122,8 @@ static void exit_usage (char *name)
 			"  General:\n"
 			"    -C <file>       Configuration file.\n"
 			"                    Default: "CONFIGFILE"\n"
+			"    -P <file>       PID-file.\n"
+			"                    Default: "PIDFILE"\n"
 #if COLLECT_DAEMON
 			"    -f              Don't fork to the background.\n"
 #endif
@@ -135,7 +136,7 @@ static void exit_usage (char *name)
 #endif
 			"  Step              "COLLECTD_STEP" seconds\n"
 			"  Heartbeat         "COLLECTD_HEARTBEAT" seconds\n"
-			"\n"PACKAGE" "VERSION", http://verplant.org/collectd/\n"
+			"\n"PACKAGE" "VERSION", http://collectd.org/\n"
 			"by Florian octo Forster <octo@verplant.org>\n"
 			"for contributions see `AUTHORS'\n");
 	exit (0);
@@ -191,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)
 		{
@@ -201,11 +202,11 @@ static int start_client (void)
 
 		if (timeval_sub_timespec (&tv_next, &tv_now, &ts_wait) != 0)
 		{
-			syslog (LOG_WARNING, "No sleeping because `timeval_sub_timespec' returned non-zero!");
+			syslog (LOG_WARNING, "Not sleeping because `timeval_sub_timespec' returned non-zero!");
 			continue;
 		}
 
-		while (nanosleep (&ts_wait, &ts_wait) == -1)
+		while ((loop == 0) && (nanosleep (&ts_wait, &ts_wait) == -1))
 		{
 			if (errno != EINTR)
 			{
@@ -221,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;
@@ -238,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 */
@@ -256,7 +271,7 @@ static int pidfile_create (const char *file)
 		return (1);
 	}
 
-	fprintf (fh, "%d\n", getpid());
+	fprintf (fh, "%i\n", (int) getpid ());
 	fclose(fh);
 
 	return (0);
@@ -281,7 +296,7 @@ int main (int argc, char **argv)
 	char *configfile = CONFIGFILE;
 #if COLLECT_DAEMON
 	struct sigaction sigChldAction;
-	char *pidfile    = PIDFILE;
+	char *pidfile    = NULL;
 	pid_t pid;
 	int daemonize    = 1;
 #endif
@@ -291,6 +306,8 @@ int main (int argc, char **argv)
 
 #if HAVE_LIBRRD
 	operating_mode = MODE_LOCAL;
+#else
+	operating_mode = MODE_CLIENT;
 #endif
 
 	/* open syslog */
@@ -303,7 +320,7 @@ int main (int argc, char **argv)
 
 		c = getopt (argc, argv, "hC:"
 #if COLLECT_DAEMON
-				"f"
+				"fP:"
 #endif
 		);
 
@@ -316,6 +333,9 @@ int main (int argc, char **argv)
 				configfile = optarg;
 				break;
 #if COLLECT_DAEMON
+			case 'P':
+				pidfile = optarg;
+				break;
 			case 'f':
 				daemonize = 0;
 				break;
@@ -366,7 +386,8 @@ int main (int argc, char **argv)
 	sigChldAction.sa_handler = SIG_IGN;
 	sigaction (SIGCHLD, &sigChldAction, NULL);
 
-	if ((pidfile = cf_get_option ("PIDFile", PIDFILE)) == NULL)
+	if ((pidfile == NULL)
+			&& ((pidfile = cf_get_option ("PIDFile", PIDFILE)) == NULL))
 	{
 		fprintf (stderr, "Cannot obtain pidfile. This shoud not happen. Ever.");
 		return (1);
@@ -436,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.");