Replaced all hardcoded heartbeat values (== 25 seconds) with `COLLECTD_HEARTBEAT'.

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index 71c1167..7f2f6e8 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -25,7 +25,7 @@
 #include "common.h"
 #include "utils_debug.h"
 
-#include "multicast.h"
+#include "network.h"
 #include "plugin.h"
 #include "configfile.h"
 
@@ -37,11 +37,6 @@ static int loop = 0;
 kstat_ctl_t *kc;
 #endif /* HAVE_LIBKSTAT */
 
-#if COLLECT_PING
-char *pinghosts[MAX_PINGHOSTS];
-int   num_pinghosts = 0;
-#endif
-
 /*
  * exported variables
  */
@@ -122,6 +117,33 @@ static void update_kstat (void)
 } /* static void update_kstat (void) */
 #endif /* HAVE_LIBKSTAT */
 
+/* TODO
+ * Remove all settings but `-f' and `-C'
+ */
+static void exit_usage (char *name)
+{
+       printf ("Usage: "PACKAGE" [OPTIONS]\n\n"
+                       
+                       "Available options:\n"
+                       "  General:\n"
+                       "    -C <file>       Configuration file.\n"
+                       "                    Default: "CONFIGFILE"\n"
+#if COLLECT_DAEMON
+                       "    -f              Don't fork to the background.\n"
+#endif
+                       "\nBuiltin defaults:\n"
+                       "  Config-File       "CONFIGFILE"\n"
+                       "  PID-File          "PIDFILE"\n"
+                       "  Data-Directory    "PKGLOCALSTATEDIR"\n"
+#if COLLECT_DEBUG
+                       "  Log-File          "LOGFILE"\n"
+#endif
+                       "\n"PACKAGE" "VERSION", http://verplant.org/collectd/\n"
+                       "by Florian octo Forster <octo@verplant.org>\n"
+                       "for contributions see `AUTHORS'\n");
+       exit (0);
+} /* static void exit_usage (char *name) */
+
 static int start_client (void)
 {
        int sleepingtime;
@@ -170,6 +192,7 @@ static int start_client (void)
 #if HAVE_LIBRRD
 static int start_server (void)
 {
+       /* FIXME use stack here! */
        char *host;
        char *type;
        char *instance;
@@ -177,7 +200,7 @@ static int start_server (void)
 
        while (loop == 0)
        {
-               if (multicast_receive (&host, &type, &instance, &values) == 0)
+               if (network_receive (&host, &type, &instance, &values) == 0)
                        plugin_write (host, type, instance, values);
 
                if (host     != NULL) free (host);     host     = NULL;
@@ -223,13 +246,12 @@ static int pidfile_remove (const char *file)
 
 int main (int argc, char **argv)
 {
-#if COLLECT_DAEMON
-       struct sigaction sigChldAction;
-#endif
        struct sigaction sigIntAction;
        struct sigaction sigTermAction;
-       char *datadir;
+       char *datadir    = PKGLOCALSTATEDIR;
+       char *configfile = CONFIGFILE;
 #if COLLECT_DAEMON
+       struct sigaction sigChldAction;
        char *pidfile    = PIDFILE;
        pid_t pid;
        int daemonize    = 1;
@@ -245,7 +267,40 @@ int main (int argc, char **argv)
        /* open syslog */
        openlog (PACKAGE, LOG_CONS | LOG_PID, LOG_DAEMON);
 
-       DBG_STARTFILE(logfile, "Debug file opened.");
+       /* read options */
+       while (1)
+       {
+               int c;
+
+               c = getopt (argc, argv, "hC:"
+#if COLLECT_DAEMON
+                               "f"
+#endif
+               );
+
+               if (c == -1)
+                       break;
+
+               switch (c)
+               {
+                       case 'C':
+                               configfile = optarg;
+                               break;
+#if COLLECT_DAEMON
+                       case 'f':
+                               daemonize = 0;
+                               break;
+#endif /* COLLECT_DAEMON */
+                       case 'h':
+                       default:
+                               exit_usage (argv[0]);
+               } /* switch (c) */
+       } /* while (1) */
+
+#if COLLECT_DEBUG
+       if ((logfile = cf_get_option ("LogFile", LOGFILE)) != NULL)
+               DBG_STARTFILE (logfile, "Debug file opened.");
+#endif
 
        /*
         * Read options from the config file, the environment and the command
@@ -253,7 +308,7 @@ int main (int argc, char **argv)
         * general).
         * Also, this will automatically load modules.
         */
-       if (cf_read (argc, argv, CONFIGFILE))
+       if (cf_read (configfile))
        {
                fprintf (stderr, "Error: Reading the config file failed!\n"
                                "Read the syslog for details.\n");
@@ -264,7 +319,7 @@ int main (int argc, char **argv)
         * Change directory. We do this _after_ reading the config and loading
         * modules to relative paths work as expected.
         */
-       if ((datadir = cf_get_mode_option ("DataDir")) == NULL)
+       if ((datadir = cf_get_option ("DataDir", PKGLOCALSTATEDIR)) == NULL)
        {
                fprintf (stderr, "Don't have a datadir to use. This should not happen. Ever.");
                return (1);
@@ -282,7 +337,7 @@ int main (int argc, char **argv)
        sigChldAction.sa_handler = SIG_IGN;
        sigaction (SIGCHLD, &sigChldAction, NULL);
 
-       if ((pidfile = cf_get_mode_option ("PIDFile")) == NULL)
+       if ((pidfile = cf_get_option ("PIDFile", PIDFILE)) == NULL)
        {
                fprintf (stderr, "Cannot obtain pidfile. This shoud not happen. Ever.");
                return (1);
@@ -352,7 +407,10 @@ int main (int argc, char **argv)
 #endif
                start_client ();
 
-       DBG_STOPFILE("debug file closed.");
+#if COLLECT_DEBUG
+       if (logfile != NULL)
+               DBG_STOPFILE("debug file closed.");
+#endif
 
        /* close syslog */
        syslog (LOG_INFO, "Exiting normally");