X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.c;h=4e18fd6e2280edcce9b1190777c846bdfa11dd3f;hb=a5322d6c70e8e7775413f2b03e3ced2637f974b6;hp=0986e403221a480ba64632e0624e6239cd522a60;hpb=06adec208286b5a136ffa5c5f3832c35e9f62844;p=collectd.git

diff --git a/src/collectd.c b/src/collectd.c
index 0986e403..4e18fd6e 100644
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -25,6 +25,7 @@
 
 #include "plugin.h"
 #include "configfile.h"
+#include "types_list.h"
 
 /*
  * Global variables
@@ -113,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);
@@ -213,6 +214,7 @@ static int do_init (void)
 	}
 #endif
 
+	read_types_list ();
 	plugin_init_all ();
 
 	return (0);
@@ -318,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;
@@ -330,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
@@ -344,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);
@@ -395,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