Merged 494:495 from `trunk' to `tags/collectd-3.8.1'

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index 190e043..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
  */
@@ -136,6 +131,13 @@ static void exit_usage (char *name)
 #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");
@@ -190,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;
@@ -197,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;
@@ -269,8 +272,7 @@ int main (int argc, char **argv)
        {
                int c;
 
-               /* FIXME */
-               c = getopt (argc, argv, "C:"
+               c = getopt (argc, argv, "hC:"
 #if COLLECT_DAEMON
                                "f"
 #endif
@@ -296,7 +298,7 @@ int main (int argc, char **argv)
        } /* while (1) */
 
 #if COLLECT_DEBUG
-       if ((logfile = cf_get_mode_option ("LogFile")) != NULL)
+       if ((logfile = cf_get_option ("LogFile", LOGFILE)) != NULL)
                DBG_STARTFILE (logfile, "Debug file opened.");
 #endif
 
@@ -317,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);
@@ -335,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);