Corrected many defines, moved log-mode functionality out of the `rrd_*' functions...

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index aacc96e..7b264e8 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,19 +37,11 @@ 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
  */
 time_t curtime;
-
-#if HAVE_LIBRRD
-int operating_mode;
-#endif
+int    operating_mode;
 
 static void sigIntHandler (int signal)
 {
@@ -136,6 +128,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 +189,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 +197,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 +269,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
@@ -401,7 +400,7 @@ int main (int argc, char **argv)
 #if HAVE_LIBRRD
        if (operating_mode == MODE_SERVER)
                start_server ();
-       else /* if (operating_mode == MODE_CLIENT || operating_mode == MODE_LOCAL) */
+       else /* if (operating_mode == MODE_CLIENT || operating_mode == MODE_LOCAL || operating_mode == MODE_LOG) */
 #endif
                start_client ();