X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcollectd.c;h=a1e15bf1e7ca52b674632b1308012c91297d2c00;hb=c4d01367a1c5dd7dde3dbaf9dc374f38f8a1020a;hp=e9bc0d5dcc89ccd032976af8beb7d6a08be1b00f;hpb=b1f49f80b6954c5761ac3bc6537c405d8c615833;p=collectd.git

diff --git a/src/collectd.c b/src/collectd.c
index e9bc0d5d..a1e15bf1 100644
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -123,6 +123,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
@@ -191,7 +193,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 +203,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)
 			{
@@ -281,7 +283,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
@@ -305,7 +307,7 @@ int main (int argc, char **argv)
 
 		c = getopt (argc, argv, "hC:"
 #if COLLECT_DAEMON
-				"f"
+				"fP:"
 #endif
 		);
 
@@ -318,6 +320,9 @@ int main (int argc, char **argv)
 				configfile = optarg;
 				break;
 #if COLLECT_DAEMON
+			case 'P':
+				pidfile = optarg;
+				break;
 			case 'f':
 				daemonize = 0;
 				break;
@@ -368,7 +373,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);
@@ -438,6 +444,8 @@ int main (int argc, char **argv)
 #endif
 		start_client ();
 
+	plugin_shutdown_all ();
+
 #if COLLECT_DEBUG
 	if (logfile != NULL)
 		DBG_STOPFILE("debug file closed.");