X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconfigfile.c;h=d61bc88fef349ee537a35cb39257068637f6b6b2;hb=1fc8ef7784730f6da37b3648fdeb4772d16cb4a9;hp=193e05d247e4db765f528dffc0cbdc692f25907d;hpb=0643de05abd288f6864df1d62c9df603dc85e79a;p=collectd.git

diff --git a/src/configfile.c b/src/configfile.c
index 193e05d2..d61bc88f 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -109,8 +109,8 @@ static cf_global_option_t cf_global_options[] =
 	{"Interval",    NULL, NULL},
 	{"ReadThreads", NULL, "5"},
 	{"WriteThreads", NULL, "5"},
-	{"WriteQueueLengthLimitHigh", NULL, NULL},
-	{"WriteQueueLengthLimitLow", NULL, NULL},
+	{"WriteQueueLimitHigh", NULL, NULL},
+	{"WriteQueueLimitLow", NULL, NULL},
 	{"Timeout",     NULL, "2"},
 	{"AutoLoadPlugin", NULL, "false"},
 	{"PreCacheChain",  NULL, "PreCache"},
@@ -384,9 +384,19 @@ static int dispatch_block_plugin (oconfig_item_t *ci)
 
 	if (IS_TRUE (global_option_get ("AutoLoadPlugin")))
 	{
+		plugin_ctx_t ctx;
+		plugin_ctx_t old_ctx;
 		int status;
 
+		/* default to the global interval set before loading this plugin */
+		memset (&ctx, 0, sizeof (ctx));
+		ctx.interval = cf_get_default_interval ();
+
+		old_ctx = plugin_set_ctx (ctx);
 		status = plugin_load (name, /* flags = */ 0);
+		/* reset to the "global" context */
+		plugin_set_ctx (old_ctx);
+
 		if (status != 0)
 		{
 			ERROR ("Automatically loading plugin \"%s\" failed "
@@ -477,6 +487,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));
@@ -591,7 +607,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;
@@ -922,27 +939,17 @@ long global_option_get_long (const char *option, long default_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, NULL, 10);
-		if (errno == ERANGE && (value == LONG_MAX || value == LONG_MIN)) return(default_value);
-		if (errno != 0 && value == 0) return(default_value);
-		return(value);
-} /* char *global_option_get_long */
-
-long global_option_get_long_in_range (const char *option, long default_value, long min, long max)
-{
-		long value;
-
-		assert(min < max);
-		value = global_option_get_long(option, default_value);
-		if(value < min) return(default_value);
-		if(value > max) return(default_value);
-		return(value);
+		value = strtol (str, /* endptr = */ NULL, /* base = */ 0);
+		if (errno != 0)
+			return (default_value);
 
-} /* char *global_option_get_long_in_range */
+		return (value);
+} /* char *global_option_get_long */
 
 cdtime_t cf_get_default_interval (void)
 {