X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollectdmon.c;h=6c50cf12509084f4958958261734bbcd6172ed9f;hb=a3b8297ca4e9b3f5e3652a347333526546306041;hp=39dc0f25ab352d11b3576ad1c6a9b0218313657f;hpb=69e5d982e7adf27a0eca6e6431f748f4913d80ac;p=collectd.git

diff --git a/src/collectdmon.c b/src/collectdmon.c
index 39dc0f25..6c50cf12 100644
--- a/src/collectdmon.c
+++ b/src/collectdmon.c
@@ -1,24 +1,33 @@
 /**
  * collectd - src/collectdmon.c
- * Copyright (C) 2007  Sebastian Harl
+ * Copyright (C) 2007       Sebastian Harl
  *
- * 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; only version 2 of the License is applicable.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
- * Author:
+ * Authors:
  *   Sebastian Harl <sh at tokkee.org>
  **/
 
+#if !defined(__GNUC__) || !__GNUC__
+# define __attribute__(x) /**/
+#endif
+
 #include "config.h"
 
 #include <assert.h>
@@ -54,7 +63,8 @@
 # define WCOREDUMP(s) 0
 #endif /* ! WCOREDUMP */
 
-static int loop = 0;
+static int loop    = 0;
+static int restart = 0;
 
 static char  *pidfile      = NULL;
 static pid_t  collectd_pid = 0;
@@ -70,8 +80,8 @@ static void exit_usage (char *name)
 
 			"\nFor <collectd options> see collectd.conf(5).\n"
 
-			"\n"PACKAGE" "VERSION", http://collectd.org/\n"
-			"by Florian octo Forster <octo@verplant.org>\n"
+			"\n"PACKAGE_NAME" "PACKAGE_VERSION", http://collectd.org/\n"
+			"by Florian octo Forster <octo@collectd.org>\n"
 			"for contributions see `AUTHORS'\n", name);
 	exit (0);
 } /* exit_usage */
@@ -139,7 +149,7 @@ static int daemonize (void)
 	if (RLIM_INFINITY == rl.rlim_max)
 		rl.rlim_max = 1024;
 
-	for (i = 0; i < rl.rlim_max; ++i)
+	for (i = 0; i < (int)rl.rlim_max; ++i)
 		close (i);
 
 	errno = 0;
@@ -165,7 +175,7 @@ static int daemonize (void)
 	return 0;
 } /* daemonize */
 
-static int collectd_start (int argc, char **argv)
+static int collectd_start (char **argv)
 {
 	pid_t pid = 0;
 
@@ -196,17 +206,28 @@ static int collectd_stop (void)
 	return 0;
 } /* collectd_stop */
 
-static void sig_int_term_handler (int signo)
+static void sig_int_term_handler (int __attribute__((unused)) signo)
 {
 	++loop;
 	return;
 } /* sig_int_term_handler */
 
+static void sig_hup_handler (int __attribute__((unused)) signo)
+{
+	++restart;
+	return;
+} /* sig_hup_handler */
+
 static void log_status (int status)
 {
 	if (WIFEXITED (status)) {
-		syslog (LOG_INFO, "Info: collectd terminated with exit status %i",
-				WEXITSTATUS (status));
+		if (0 == WEXITSTATUS (status))
+			syslog (LOG_INFO, "Info: collectd terminated with exit status %i",
+					WEXITSTATUS (status));
+		else
+			syslog (LOG_WARNING,
+					"Warning: collectd terminated with exit status %i",
+					WEXITSTATUS (status));
 	}
 	else if (WIFSIGNALED (status)) {
 		syslog (LOG_WARNING, "Warning: collectd was terminated by signal %i%s",
@@ -312,16 +333,17 @@ int main (int argc, char **argv)
 		return 1;
 	}
 
-	sigaddset (&sa.sa_mask, SIGCHLD);
-	if (0 != sigprocmask (SIG_BLOCK, &sa.sa_mask, NULL)) {
-		syslog (LOG_ERR, "Error: sigprocmask() failed: %s", strerror (errno));
+	sa.sa_handler = sig_hup_handler;
+
+	if (0 != sigaction (SIGHUP, &sa, NULL)) {
+		syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno));
 		return 1;
 	}
 
 	while (0 == loop) {
 		int status = 0;
 
-		if (0 != collectd_start (collectd_argc, collectd_argv)) {
+		if (0 != collectd_start (collectd_argv)) {
 			syslog (LOG_ERR, "Error: failed to start collectd.");
 			break;
 		}
@@ -329,7 +351,7 @@ int main (int argc, char **argv)
 		assert (0 < collectd_pid);
 		while ((collectd_pid != waitpid (collectd_pid, &status, 0))
 				&& (EINTR == errno))
-			if (0 != loop)
+			if ((0 != loop) || (0 != restart))
 				collectd_stop ();
 
 		collectd_pid = 0;
@@ -337,7 +359,11 @@ int main (int argc, char **argv)
 		log_status (status);
 		check_respawn ();
 
-		if (0 == loop)
+		if (0 != restart) {
+			syslog (LOG_INFO, "Info: restarting collectd");
+			restart = 0;
+		}
+		else if (0 == loop)
 			syslog (LOG_WARNING, "Warning: restarting collectd");
 	}