Added to src/configfile.c:

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index 5458a2c..0d9a7db 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -21,17 +21,19 @@
  *   Alvaro Barcellos <alvaro.barcellos at gmail.com>
  **/
 
+#include "collectd.h"
 #include "common.h"
 #include "utils_debug.h"
 
 #include "multicast.h"
 #include "plugin.h"
+#include "configfile.h"
 
 #include "ping.h"
 
 static int loop = 0;
 
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT
 kstat_ctl_t *kc;
 #endif /* HAVE_LIBKSTAT */
 
@@ -45,7 +47,7 @@ int   num_pinghosts = 0;
  */
 time_t curtime;
 
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
 int operating_mode;
 #endif
 
@@ -54,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);
@@ -70,12 +77,12 @@ static int change_basedir (char *dir)
                {
                        if (mkdir (dir, 0755) == -1)
                        {
-                               syslog (LOG_ERR, "mkdir: %s", strerror (errno));
+                               syslog (LOG_ERR, "mkdir (%s): %s", dir, strerror (errno));
                                return (-1);
                        }
                        else if (chdir (dir) == -1)
                        {
-                               syslog (LOG_ERR, "chdir: %s", strerror (errno));
+                               syslog (LOG_ERR, "chdir (%s): %s", dir, strerror (errno));
                                return (-1);
                        }
                }
@@ -89,7 +96,7 @@ static int change_basedir (char *dir)
        return (0);
 } /* static int change_basedir (char *dir) */
 
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT
 static void update_kstat (void)
 {
        if (kc == NULL)
@@ -121,10 +128,8 @@ static void exit_usage (char *name)
                        
                        "Available options:\n"
                        "  General:\n"
-                       /*
                        "    -C <file>       Configuration file.\n"
                        "                    Default: "CONFIGFILE"\n"
-                       */
 #if COLLECT_DAEMON
                        "    -P <file>       PID file.\n"
                        "                    Default: "PIDFILE"\n"
@@ -160,12 +165,12 @@ static int start_client (void)
 {
        int sleepingtime;
 
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT
        kc = NULL;
        update_kstat ();
 #endif
 
-#ifdef HAVE_LIBSTATGRAB
+#if HAVE_LIBSTATGRAB
        if (sg_init ())
        {
                syslog (LOG_ERR, "sg_init: %s", sg_str_error (sg_get_error ()));
@@ -184,7 +189,7 @@ static int start_client (void)
        while (loop == 0)
        {
                curtime = time (NULL);
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT
                update_kstat ();
 #endif
                plugin_read_all ();
@@ -201,7 +206,7 @@ static int start_client (void)
        return (0);
 } /* static int start_client (void) */
 
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
 static int start_server (void)
 {
        char *host;
@@ -225,7 +230,7 @@ static int start_server (void)
 #endif /* HAVE_LIBRRD */
 
 #if COLLECT_DAEMON
-static int pidfile_create (char *file)
+static int pidfile_create (const char *file)
 {
        FILE *fh;
 
@@ -242,32 +247,39 @@ static int pidfile_create (char *file)
        fclose(fh);
 
        return (0);
-} /* static int pidfile_create (char *file) */
+} /* static int pidfile_create (const char *file) */
 #endif /* COLLECT_DAEMON */
 
 #if COLLECT_DAEMON
-static int pidfile_remove (void)
+static int pidfile_remove (const char *file)
 {
-      return (unlink (PIDFILE));
-} /* static int pidfile_remove (void) */
+       if (file == NULL) {
+               file = PIDFILE;
+       }
+       return (unlink (file));
+} /* static int pidfile_remove (const char *file) */
 #endif /* COLLECT_DAEMON */
 
 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;
        pid_t pid;
-       int daemonize = 1;
+       int daemonize    = 1;
 #endif
 #if COLLECT_DEBUG
        char *logfile    = LOGFILE;
 #endif
 
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
        operating_mode = MODE_LOCAL;
 #endif
 
@@ -299,7 +311,7 @@ int main (int argc, char **argv)
 
                switch (c)
                {
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
                        case 'c':
                                operating_mode = MODE_CLIENT;
                                break;
@@ -350,16 +362,28 @@ 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;
+
        /*
-        * Load plugins and change to output directory
-        * Loading plugins is done first so relative paths work as expected..
+        * Read the config file. This will load any modules automagically.
         */
-       if (plugin_load_all (plugindir) < 1)
+       plugin_set_dir (plugindir);
+
+       if (cf_read (configfile))
        {
-               fprintf (stderr, "Error: No plugins found.\n");
+               fprintf (stderr, "Error: Reading the config file failed!\n"
+                               "Read the syslog for details.\n");
                return (1);
        }
 
+       /*
+        * Change directory. We do this _after_ reading the config and loading
+        * modules to relative paths work as expected.
+        */
        if (change_basedir (datadir))
        {
                fprintf (stderr, "Error: Unable to change to directory `%s'.\n", datadir);
@@ -367,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)
@@ -425,9 +443,18 @@ 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
         */
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
        if (operating_mode == MODE_SERVER)
                start_server ();
        else /* if (operating_mode == MODE_CLIENT || operating_mode == MODE_LOCAL) */
@@ -442,8 +469,8 @@ int main (int argc, char **argv)
 
 #if COLLECT_DAEMON
        if (daemonize)
-               pidfile_remove();
+               pidfile_remove(pidfile);
 #endif /* COLLECT_DAEMON */
 
        return (0);
-}
+} /* int main (int argc, char **argv) */