Beautifying many debug messages..

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index 49998f9..4e18fd6 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -114,7 +114,7 @@ static int change_basedir (const char *orig_dir)
                        if (mkdir (orig_dir, 0755) == -1)
                        {
                                char errbuf[1024];
-                               ERROR ("mkdir (%s): %s", orig_dir,
+                               ERROR ("change_basedir: mkdir (%s): %s", orig_dir,
                                                sstrerror (errno, errbuf,
                                                        sizeof (errbuf)));
                                return (-1);
@@ -320,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;
@@ -332,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
@@ -346,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);
@@ -397,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