Many build fixes that turned up with GCC 4.6.

[collectd.git] / src / collectdmon.c

diff --git a/src/collectdmon.c b/src/collectdmon.c
index 39dc0f2..078b2eb 100644 (file)
--- a/src/collectdmon.c
+++ b/src/collectdmon.c
@@ -19,6 +19,10 @@
  *   Sebastian Harl <sh at tokkee.org>
  **/
 
+#if !defined(__GNUC__) || !__GNUC__
+# define __attribute__(x) /**/
+#endif
+
 #include "config.h"
 
 #include <assert.h>
@@ -54,7 +58,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;
@@ -139,7 +144,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 +170,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 +201,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 +328,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 +346,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 +354,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");
        }