X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconfigfile.c;h=d3d3841250fae0c784706cb512ad5b35b68553ba;hb=5e02dec23bf3c5ed671412c8a48fd0deaade8ba3;hp=6a83072a09ca13709d09570b97c4a099eacedc3b;hpb=633c3966f770e4d46651a2fe219a18d8a9907a9f;p=collectd.git

diff --git a/src/configfile.c b/src/configfile.c
index 6a83072a..d3d38412 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -118,7 +118,8 @@ static cf_global_option_t cf_global_options[] =
 	{"Timeout",     NULL, "2"},
 	{"AutoLoadPlugin", NULL, "false"},
 	{"PreCacheChain",  NULL, "PreCache"},
-	{"PostCacheChain", NULL, "PostCache"}
+	{"PostCacheChain", NULL, "PostCache"},
+	{"MaxReadInterval", NULL, "86400"}
 };
 static int cf_global_options_num = STATIC_ARRAY_SIZE (cf_global_options);
 
@@ -288,14 +289,10 @@ static int dispatch_loadplugin (const oconfig_item_t *ci)
 		if (strcasecmp("Globals", ci->children[i].key) == 0)
 			cf_util_get_flag (ci->children + i, &flags, PLUGIN_FLAGS_GLOBAL);
 		else if (strcasecmp ("Interval", ci->children[i].key) == 0) {
-			double interval = 0.0;
-
-			if (cf_util_get_double (ci->children + i, &interval) != 0) {
-				/* cf_util_get_double will log an error */
+			if (cf_util_get_cdtime (ci->children + i, &ctx.interval) != 0) {
+				/* cf_util_get_cdtime will log an error */
 				continue;
 			}
-
-			ctx.interval = DOUBLE_TO_CDTIME_T (interval);
 		}
 		else {
 			WARNING("Ignoring unknown LoadPlugin option \"%s\" "
@@ -481,6 +478,12 @@ static int cf_ci_replace_child (oconfig_item_t *dst, oconfig_item_t *src,
 
 	/* Resize the memory containing the children to be big enough to hold
 	 * all children. */
+	if (dst->children_num + src->children_num - 1 == 0)
+	{
+		dst->children_num = 0;
+		return (0);
+	}
+
 	temp = (oconfig_item_t *) realloc (dst->children,
 			sizeof (oconfig_item_t)
 			* (dst->children_num + src->children_num - 1));
@@ -595,7 +598,8 @@ static int cf_include_all (oconfig_item_t *root, int depth)
 			return (-1);
 
 		/* Now replace the i'th child in `root' with `new'. */
-		cf_ci_replace_child (root, new, i);
+		if (cf_ci_replace_child (root, new, i) < 0)
+			return (-1);
 
 		/* ... and go back to the new i'th child. */
 		--i;
@@ -895,6 +899,13 @@ int global_option_set (const char *option, const char *value)
 	if (i >= cf_global_options_num)
 		return (-1);
 
+	if (strcasecmp (option, "PIDFile") == 0 && pidfile_from_cli == 1)
+	{
+		DEBUG ("Configfile: Ignoring `PIDFILE' option because "
+			"command-line option `-P' take precedence.");
+		return (0);
+	}
+
 	sfree (cf_global_options[i].value);
 
 	if (value != NULL)
@@ -923,19 +934,19 @@ const char *global_option_get (const char *option)
 
 long global_option_get_long (const char *option, long default_value)
 {
-		const char *str;
-		long value;
+	const char *str;
+	long value;
 
-		str = global_option_get (option);
-		if (NULL == str)
-			return (default_value);
+	str = global_option_get (option);
+	if (NULL == str)
+		return (default_value);
 
-		errno = 0;
-		value = strtol (str, /* endptr = */ NULL, /* base = */ 0);
-		if (errno != 0)
-			return (default_value);
+	errno = 0;
+	value = strtol (str, /* endptr = */ NULL, /* base = */ 0);
+	if (errno != 0)
+		return (default_value);
 
-		return (value);
+	return (value);
 } /* char *global_option_get_long */
 
 cdtime_t cf_get_default_interval (void)