Fixed documentation in `configfile.h': s/Module/Plugin/

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index af3d106182d9ce93ea6f0a75b1e89cc3eee56873..0d9a7db872cf8b714383bff404eeb44e64f43f90 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -21,11 +21,13 @@
  *   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"
 
@@ -49,14 +51,17 @@ time_t curtime;
 int operating_mode;
 #endif
 
-static void
-sigIntHandler (int signal)
+static void sigIntHandler (int signal)
 {
        loop++;
 }
 
-static int
-change_basedir (char *dir)
+static void sigTermHandler (int signal)
+{
+       loop++;
+}
+
+static int change_basedir (char *dir)
 {
        int dirlen = strlen (dir);
        
@@ -72,12 +77,12 @@ 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);
                        }
                }
@@ -92,8 +97,7 @@ change_basedir (char *dir)
 } /* static int change_basedir (char *dir) */
 
 #if HAVE_LIBKSTAT
-static void
-update_kstat (void)
+static void update_kstat (void)
 {
        if (kc == NULL)
        {
@@ -118,8 +122,7 @@ update_kstat (void)
 } /* static void update_kstat (void) */
 #endif /* HAVE_LIBKSTAT */
 
-static void
-exit_usage (char *name)
+static void exit_usage (char *name)
 {
        printf ("Usage: "PACKAGE" [OPTIONS]\n\n"
                        
@@ -127,12 +130,6 @@ exit_usage (char *name)
                        "  General:\n"
                        "    -C <file>       Configuration file.\n"
                        "                    Default: "CONFIGFILE"\n"
-                       /* sure you want a configFILE?
-                          what about a configDIR? - niki */
-                       /*
-                       "    -C <dir>        Configuration directory.\n"
-                       "                    Default: "CONFIGDIR"\n"
-                       */
 #if COLLECT_DAEMON
                        "    -P <file>       PID file.\n"
                        "                    Default: "PIDFILE"\n"
@@ -164,8 +161,7 @@ exit_usage (char *name)
        exit (0);
 } /* static void exit_usage (char *name) */
 
-static int
-start_client (void)
+static int start_client (void)
 {
        int sleepingtime;
 
@@ -211,8 +207,7 @@ start_client (void)
 } /* static int start_client (void) */
 
 #if HAVE_LIBRRD
-static int
-start_server (void)
+static int start_server (void)
 {
        char *host;
        char *type;
@@ -235,8 +230,7 @@ start_server (void)
 #endif /* HAVE_LIBRRD */
 
 #if COLLECT_DAEMON
-static int
-pidfile_create (const char *file)
+static int pidfile_create (const char *file)
 {
        FILE *fh;
 
@@ -257,8 +251,7 @@ pidfile_create (const char *file)
 #endif /* COLLECT_DAEMON */
 
 #if COLLECT_DAEMON
-static int
-pidfile_remove (const char *file)
+static int pidfile_remove (const char *file)
 {
        if (file == NULL) {
                file = PIDFILE;
@@ -267,18 +260,20 @@ pidfile_remove (const char *file)
 } /* static int pidfile_remove (const char *file) */
 #endif /* COLLECT_DAEMON */
 
-int
-main (int argc, char **argv)
+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;
-/* or  char *configdir = CONFIGDIR; */
-       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;
@@ -331,7 +326,6 @@ main (int argc, char **argv)
 #endif /* HAVE_LIBRRD */
                        case 'C':
                                configfile = optarg;
-                               /* configdir = optarg; */
                                break;
 #if COLLECT_DAEMON
                        case 'P':
@@ -368,16 +362,28 @@ 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);
@@ -385,18 +391,12 @@ 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)
@@ -442,6 +442,15 @@ main (int argc, char **argv)
        } /* if (daemonize) */
 #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
         */