X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fconfigfile.c;h=b2997d647233b3a1bf3c63994ffe7e89865e40e6;hb=f7cf0dad2e933ac6066ca5f27645ee577f065710;hp=1a957f67463f138c673cc5dd5f23ebcbabffa8c3;hpb=7936f094388707ee066b2e9f3fc75659e1715181;p=collectd.git

diff --git a/src/configfile.c b/src/configfile.c
index 1a957f67..b2997d64 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -75,7 +75,7 @@ typedef struct cf_global_option_s
  */
 static int dispatch_value_typesdb (const oconfig_item_t *ci);
 static int dispatch_value_plugindir (const oconfig_item_t *ci);
-static int dispatch_value_loadplugin (const oconfig_item_t *ci);
+static int dispatch_loadplugin (const oconfig_item_t *ci);
 
 /*
  * Private variables
@@ -87,7 +87,7 @@ static cf_value_map_t cf_value_map[] =
 {
 	{"TypesDB",    dispatch_value_typesdb},
 	{"PluginDir",  dispatch_value_plugindir},
-	{"LoadPlugin", dispatch_value_loadplugin}
+	{"LoadPlugin", dispatch_loadplugin}
 };
 static int cf_value_map_num = STATIC_ARRAY_LEN (cf_value_map);
 
@@ -239,8 +239,10 @@ static int dispatch_value_plugindir (const oconfig_item_t *ci)
 	return (0);
 }
 
-static int dispatch_value_loadplugin (const oconfig_item_t *ci)
+static int dispatch_loadplugin (const oconfig_item_t *ci)
 {
+	int i;
+	uint32_t flags = 0;
 	assert (strcasecmp (ci->key, "LoadPlugin") == 0);
 
 	if (ci->values_num != 1)
@@ -248,7 +250,19 @@ static int dispatch_value_loadplugin (const oconfig_item_t *ci)
 	if (ci->values[0].type != OCONFIG_TYPE_STRING)
 		return (-1);
 
-	return (plugin_load (ci->values[0].value.string));
+	for (i = 0; i < ci->children_num; ++i) {
+		if (ci->children[i].values_num != 1 ||
+				ci->children[i].values[0].type != OCONFIG_TYPE_BOOLEAN) {
+			WARNING("Ignoring unknown LoadPlugin option %s for plugin %s", ci->children[i].key, ci->values[0].value.string);
+			continue;
+		}
+		if (strcasecmp(ci->children[i].key, "globals") == 0) {
+			flags |= PLUGIN_FLAGS_GLOBAL;
+		} else {
+			WARNING("Ignoring unknown LoadPlugin option %s for plugin %s", ci->children[i].key, ci->values[0].value.string);
+		}
+	}
+	return (plugin_load (ci->values[0].value.string, flags));
 } /* int dispatch_value_loadplugin */
 
 static int dispatch_value_plugin (const char *plugin, oconfig_item_t *ci)
@@ -353,7 +367,9 @@ static int dispatch_block_plugin (oconfig_item_t *ci)
 
 static int dispatch_block (oconfig_item_t *ci)
 {
-	if (strcasecmp (ci->key, "Plugin") == 0)
+	if (strcasecmp (ci->key, "LoadPlugin") == 0)
+		return (dispatch_loadplugin (ci));
+	else if (strcasecmp (ci->key, "Plugin") == 0)
 		return (dispatch_block_plugin (ci));
 	else if (strcasecmp (ci->key, "Threshold") == 0)
 		return (ut_config (ci));
@@ -927,7 +943,7 @@ int cf_util_get_string (const oconfig_item_t *ci, char **ret_string) /* {{{ */
 
 	if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
 	{
-		ERROR ("cf_util_get_string: The %s plugin requires "
+		ERROR ("cf_util_get_string: The %s option requires "
 				"exactly one string argument.", ci->key);
 		return (-1);
 	}
@@ -943,6 +959,23 @@ int cf_util_get_string (const oconfig_item_t *ci, char **ret_string) /* {{{ */
 	return (0);
 } /* }}} int cf_util_get_string */
 
+int cf_util_get_boolean (const oconfig_item_t *ci, _Bool *ret_bool) /* {{{ */
+{
+	if ((ci == NULL) || (ret_bool == NULL))
+		return (EINVAL);
+
+	if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_BOOLEAN))
+	{
+		ERROR ("cf_util_get_boolean: The %s option requires "
+				"exactly one string argument.", ci->key);
+		return (-1);
+	}
+
+	*ret_bool = ci->values[0].value.boolean ? true : false;
+
+	return (0);
+} /* }}} int cf_util_get_boolean */
+
 /* Assures that the config option is a string. The string is then converted to
  * a port number using `service_name_to_port_number' and returned. Returns the
  * port number in the range [1-65535] or less than zero upon failure. */
@@ -950,7 +983,7 @@ int cf_util_get_port_number (const oconfig_item_t *ci) /* {{{ */
 {
 	if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
 	{
-		ERROR ("cf_util_get_port_number: The %s plugin requires "
+		ERROR ("cf_util_get_port_number: The %s option requires "
 				"exactly one string argument.", ci->key);
 		return (-1);
 	}