collectd-nagios(1) and collectd-unixsock(5): Reference one another.

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index 9f3c62b..49998f9 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -23,9 +23,9 @@
 #include "collectd.h"
 #include "common.h"
 
-#include "network.h"
 #include "plugin.h"
 #include "configfile.h"
+#include "types_list.h"
 
 /*
  * Global variables
@@ -70,7 +70,7 @@ static int init_global_variables (void)
 
        str = global_option_get ("Interval");
        if (str == NULL)
-               str = COLLECTD_STEP;
+               str = "10";
        interval_g = atoi (str);
        if (interval_g <= 0)
        {
@@ -187,11 +187,6 @@ static void exit_usage (char *name)
                        "  Config-File       "CONFIGFILE"\n"
                        "  PID-File          "PIDFILE"\n"
                        "  Data-Directory    "PKGLOCALSTATEDIR"\n"
-#if COLLECT_DEBUG
-                       "  Log-File          "LOGFILE"\n"
-#endif
-                       "  Step              "COLLECTD_STEP" seconds\n"
-                       "  Heartbeat         "COLLECTD_HEARTBEAT" seconds\n"
                        "\n"PACKAGE" "VERSION", http://collectd.org/\n"
                        "by Florian octo Forster <octo@verplant.org>\n"
                        "for contributions see `AUTHORS'\n");
@@ -219,6 +214,7 @@ static int do_init (void)
        }
 #endif
 
+       read_types_list ();
        plugin_init_all ();
 
        return (0);