Beautifying many debug messages..

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index e873adc..4e18fd6 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)
        {
@@ -91,7 +91,9 @@ static int change_basedir (const char *orig_dir)
 
        if (dir == NULL)
        {
-               ERROR ("strdup failed: %s", strerror (errno));
+               char errbuf[1024];
+               ERROR ("strdup failed: %s",
+                               sstrerror (errno, errbuf, sizeof (errbuf)));
                return (-1);
        }
        
@@ -111,21 +113,27 @@ static int change_basedir (const char *orig_dir)
                {
                        if (mkdir (orig_dir, 0755) == -1)
                        {
-                               ERROR ("mkdir (%s): %s", orig_dir,
-                                               strerror (errno));
+                               char errbuf[1024];
+                               ERROR ("change_basedir: mkdir (%s): %s", orig_dir,
+                                               sstrerror (errno, errbuf,
+                                                       sizeof (errbuf)));
                                return (-1);
                        }
                        else if (chdir (orig_dir) == -1)
                        {
+                               char errbuf[1024];
                                ERROR ("chdir (%s): %s", orig_dir,
-                                               strerror (errno));
+                                               sstrerror (errno, errbuf,
+                                                       sizeof (errbuf)));
                                return (-1);
                        }
                }
                else
                {
+                       char errbuf[1024];
                        ERROR ("chdir (%s): %s", orig_dir,
-                                       strerror (errno));
+                                       sstrerror (errno, errbuf,
+                                               sizeof (errbuf)));
                        return (-1);
                }
        }
@@ -179,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");
@@ -211,6 +214,7 @@ static int do_init (void)
        }
 #endif
 
+       read_types_list ();
        plugin_init_all ();
 
        return (0);
@@ -227,7 +231,10 @@ static int do_loop (void)
        {
                if (gettimeofday (&tv_next, NULL) < 0)
                {
-                       ERROR ("gettimeofday failed: %s", strerror (errno));
+                       char errbuf[1024];
+                       ERROR ("gettimeofday failed: %s",
+                                       sstrerror (errno, errbuf,
+                                               sizeof (errbuf)));
                        return (-1);
                }
                tv_next.tv_sec += interval_g;
@@ -241,8 +248,10 @@ static int do_loop (void)
 
                if (gettimeofday (&tv_now, NULL) < 0)
                {
+                       char errbuf[1024];
                        ERROR ("gettimeofday failed: %s",
-                                       strerror (errno));
+                                       sstrerror (errno, errbuf,
+                                               sizeof (errbuf)));
                        return (-1);
                }
 
@@ -258,7 +267,10 @@ static int do_loop (void)
                {
                        if (errno != EINTR)
                        {
-                               ERROR ("nanosleep failed: %s", strerror (errno));
+                               char errbuf[1024];
+                               ERROR ("nanosleep failed: %s",
+                                               sstrerror (errno, errbuf,
+                                                       sizeof (errbuf)));
                                return (-1);
                        }
                }
@@ -282,7 +294,9 @@ static int pidfile_create (void)
 
        if ((fh = fopen (file, "w")) == NULL)
        {
-               ERROR ("fopen (%s): %s", file, strerror (errno));
+               char errbuf[1024];
+               ERROR ("fopen (%s): %s", file,
+                               sstrerror (errno, errbuf, sizeof (errbuf)));
                return (1);
        }
 
@@ -306,6 +320,7 @@ int main (int argc, char **argv)
        struct sigaction sigIntAction;
        struct sigaction sigTermAction;
        char *configfile = CONFIGFILE;
+       int test_config  = 0;
        const char *basedir;
 #if COLLECT_DAEMON
        struct sigaction sigChldAction;
@@ -318,7 +333,7 @@ int main (int argc, char **argv)
        {
                int c;
 
-               c = getopt (argc, argv, "hC:"
+               c = getopt (argc, argv, "htC:"
 #if COLLECT_DAEMON
                                "fP:"
 #endif
@@ -332,6 +347,9 @@ int main (int argc, char **argv)
                        case 'C':
                                configfile = optarg;
                                break;
+                       case 't':
+                               test_config = 1;
+                               break;
 #if COLLECT_DAEMON
                        case 'P':
                                global_option_set ("PIDFile", optarg);
@@ -383,6 +401,9 @@ int main (int argc, char **argv)
        if (init_global_variables () != 0)
                return (1);
 
+       if (test_config)
+               return (0);
+
 #if COLLECT_DAEMON
        /*
         * fork off child
@@ -396,7 +417,10 @@ int main (int argc, char **argv)
                if ((pid = fork ()) == -1)
                {
                        /* error */
-                       fprintf (stderr, "fork: %s", strerror (errno));
+                       char errbuf[1024];
+                       fprintf (stderr, "fork: %s",
+                                       sstrerror (errno, errbuf,
+                                               sizeof (errbuf)));
                        return (1);
                }
                else if (pid != 0)