Added to src/configfile.c:

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index c86a678..0d9a7db 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -21,6 +21,7 @@
  *   Alvaro Barcellos <alvaro.barcellos at gmail.com>
  **/
 
+#include "collectd.h"
 #include "common.h"
 #include "utils_debug.h"
 
@@ -55,6 +56,11 @@ static void sigIntHandler (int signal)
        loop++;
 }
 
+static void sigTermHandler (int signal)
+{
+       loop++;
+}
+
 static int change_basedir (char *dir)
 {
        int dirlen = strlen (dir);
@@ -256,9 +262,13 @@ static int pidfile_remove (const char *file)
 
 int main (int argc, char **argv)
 {
-       struct sigaction sigIntAction, sigChldAction;
+#if COLLECT_DAEMON
+       struct sigaction sigChldAction;
+#endif
+       struct sigaction sigIntAction;
+       struct sigaction sigTermAction;
        char *configfile = CONFIGFILE;
-       char *plugindir  = PLUGINDIR;
+       char *plugindir  = NULL;
        char *datadir    = PKGLOCALSTATEDIR;
 #if COLLECT_DAEMON
        char *pidfile    = PIDFILE;
@@ -352,6 +362,12 @@ int main (int argc, char **argv)
 
        DBG_STARTFILE(logfile, "debug file opened.");
 
+       /* FIXME this is the wrong place to call this function, because
+        * `cf_read' is called below. We'll need an extra callback for this.
+        * Right now though I'm to tired to do this. G'night. -octo */
+       if ((plugindir == NULL) && ((plugindir = cf_get_mode_option ("PluginDir")) == NULL))
+               plugindir = PLUGINDIR;
+
        /*
         * Read the config file. This will load any modules automagically.
         */
@@ -375,18 +391,12 @@ int main (int argc, char **argv)
        }
 
        /*
-        * install signal handlers
+        * fork off child
         */
-       sigIntAction.sa_handler = sigIntHandler;
-       sigaction (SIGINT, &sigIntAction, NULL);
-
+#if COLLECT_DAEMON
        sigChldAction.sa_handler = SIG_IGN;
        sigaction (SIGCHLD, &sigChldAction, NULL);
 
-       /*
-        * fork off child
-        */
-#if COLLECT_DAEMON
        if (daemonize)
        {
                if ((pid = fork ()) == -1)
@@ -433,6 +443,15 @@ int main (int argc, char **argv)
 #endif /* COLLECT_DAEMON */
 
        /*
+        * install signal handlers
+        */
+       sigIntAction.sa_handler = sigIntHandler;
+       sigaction (SIGINT, &sigIntAction, NULL);
+
+       sigIntAction.sa_handler = sigTermHandler;
+       sigaction (SIGTERM, &sigTermAction, NULL);
+
+       /*
         * run the actual loops
         */
 #if HAVE_LIBRRD