X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconfigfile.c;h=39265868eac9dfb3eee7e2c79221c5be2c92c4d2;hb=fa3e58be7ba5762f59f4f1b86cb6431cd4813a6a;hp=a0610041257525ba50e6013c473dbb357866262b;hpb=500559839355fc4061afe1d010d9f9479bca450d;p=collectd.git

diff --git a/src/configfile.c b/src/configfile.c
index a0610041..39265868 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/configfile.c
- * Copyright (C) 2005  Florian octo Forster
+ * Copyright (C) 2005,2006  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -24,8 +24,10 @@
 
 #include "libconfig/libconfig.h"
 
+#include "common.h"
 #include "plugin.h"
 #include "configfile.h"
+#include "network.h"
 #include "utils_debug.h"
 
 #define SHORTOPT_NONE 0
@@ -35,11 +37,16 @@
 #define ERR_NEEDS_ARG "Section `%s' needs an argument.\n"
 #define ERR_NEEDS_SECTION "`%s' can only be used within a section.\n"
 
-#ifdef HAVE_LIBRRD
+#define ESCAPE_NULL(str) ((str) == NULL ? "(null)" : (str))
+
+#define DEBUG_CALLBACK(shortvar, var, arguments, value) \
+	DBG("shortvar = %s, var = %s, arguments = %s, value = %s, ...", \
+			ESCAPE_NULL(shortvar), \
+			ESCAPE_NULL(var), \
+			ESCAPE_NULL(arguments), \
+			ESCAPE_NULL(value))
+
 extern int operating_mode;
-#else
-static int operating_mode = MODE_CLIENT;
-#endif
 
 typedef struct cf_callback
 {
@@ -59,28 +66,30 @@ typedef struct cf_mode_item
 	int   mode;
 } cf_mode_item_t;
 
+/* TODO
+ * - LogFile
+ */
 static cf_mode_item_t cf_mode_list[] =
 {
-	{"Server",      NULL, MODE_CLIENT                           },
-	{"Port",        NULL, MODE_CLIENT | MODE_SERVER             },
-	{"PIDFile",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL},
-	{"DataDir",     NULL, MODE_SERVER |               MODE_LOCAL},
-	{"PluginDir",   NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL}
+	{"TimeToLive",  NULL, MODE_CLIENT                           },
+	{"PIDFile",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL | MODE_LOG },
+	{"DataDir",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL | MODE_LOG },
+	{"LogFile",     NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL | MODE_LOG }
 };
-static int cf_mode_num = 5;
+static int cf_mode_num = 4;
 
 static int nesting_depth = 0;
 static char *current_module = NULL;
 
-/* cf_register needs this prototype */
-int cf_callback_dispatch (const char *, const char *, const char *,
-		const char *, lc_flags_t, void *);
+/* `cf_register' needs this prototype */
+static int cf_callback_plugin_dispatch (const char *, const char *,
+		const char *, const char *, lc_flags_t, void *);
 
 /*
  * Functions to handle register/unregister, search, and other plugin related
  * stuff
  */
-cf_callback_t *cf_search (char *type)
+static cf_callback_t *cf_search (char *type)
 {
 	cf_callback_t *cf_cb;
 
@@ -94,7 +103,7 @@ cf_callback_t *cf_search (char *type)
 	return (cf_cb);
 }
 
-int cf_dispatch (char *type, const char *orig_key, const char *orig_value)
+static int cf_dispatch (char *type, const char *orig_key, const char *orig_value)
 {
 	cf_callback_t *cf_cb;
 	char *key;
@@ -102,9 +111,14 @@ int cf_dispatch (char *type, const char *orig_key, const char *orig_value)
 	int ret;
 	int i;
 
+	DBG ("type = %s, key = %s, value = %s",
+			ESCAPE_NULL(type),
+			ESCAPE_NULL(orig_key),
+			ESCAPE_NULL(orig_value));
+
 	if ((cf_cb = cf_search (type)) == NULL)
 	{
-		syslog (LOG_WARNING, "Plugin `%s' did not register a callback.\n", type);
+		syslog (LOG_WARNING, "Plugin `%s' did not register a callback.", type);
 		return (-1);
 	}
 
@@ -128,11 +142,13 @@ int cf_dispatch (char *type, const char *orig_key, const char *orig_value)
 	}
 
 	if (i >= cf_cb->keys_num)
-		syslog (LOG_WARNING, "Plugin `%s' did not register for value `%s'.\n", type, key);
+		syslog (LOG_WARNING, "Plugin `%s' did not register for value `%s'.", type, key);
 
 	free (key);
 	free (value);
 
+	DBG ("return (%i)", ret);
+
 	return (ret);
 }
 
@@ -186,12 +202,12 @@ void cf_register (char *type,
 			 * `key', but apparently `lc_register_*' can handle
 			 * it.. */
 			lc_register_callback (buf, SHORTOPT_NONE,
-					LC_VAR_STRING, cf_callback_dispatch,
+					LC_VAR_STRING, cf_callback_plugin_dispatch,
 					NULL);
 		}
 		else
 		{
-			DBG ("Key was truncated: `%s'", keys[i]);
+			DBG ("Key was truncated: `%s'", ESCAPE_NULL(keys[i]));
 		}
 	}
 }
@@ -199,7 +215,7 @@ void cf_register (char *type,
 /*
  * Other query functions
  */
-char *cf_get_mode_option (const char *key)
+char *cf_get_option (const char *key, char *def)
 {
 	int i;
 
@@ -208,42 +224,79 @@ char *cf_get_mode_option (const char *key)
 		if ((cf_mode_list[i].mode & operating_mode) == 0)
 			continue;
 
-		if (strcasecmp (cf_mode_list[i].key, key) == 0)
+		if (strcasecmp (cf_mode_list[i].key, key) != 0)
+			continue;
+
+		if (cf_mode_list[i].value != NULL)
 			return (cf_mode_list[i].value);
+		return (def);
 	}
 
 	return (NULL);
 }
 
-/* 
- * Functions for the actual parsing
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Functions for the actual parsing                                    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * `cf_callback_mode'
+ *   Chose the `operating_mode'
+ *
+ * Mode `value'
  */
-int cf_callback_dispatch (const char *shortvar, const char *var,
+static int cf_callback_mode (const char *shortvar, const char *var,
 		const char *arguments, const char *value, lc_flags_t flags,
 		void *extra)
 {
-	DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
-			shortvar, var, arguments, value);
-
-	if ((nesting_depth == 0) || (current_module == NULL))
+	DEBUG_CALLBACK (shortvar, var, arguments, value);
+
+	if (strcasecmp (value, "Client") == 0)
+		operating_mode = MODE_CLIENT;
+#if HAVE_LIBRRD
+	else if (strcasecmp (value, "Server") == 0)
+		operating_mode = MODE_SERVER;
+	else if (strcasecmp (value, "Local") == 0)
+		operating_mode = MODE_LOCAL;
+#endif
+	else if (strcasecmp (value, "Log") == 0)
+		operating_mode = MODE_LOG;
+	else
 	{
-		fprintf (stderr, ERR_NEEDS_SECTION, shortvar);
+		syslog (LOG_ERR, "Invalid value for config option `Mode': `%s'", value);
 		return (LC_CBRET_ERROR);
 	}
 
-	/* Send the data to the plugin */
-	if (cf_dispatch (current_module, shortvar, value) < 0)
-		return (LC_CBRET_ERROR);
+	return (LC_CBRET_OKAY);
+}
+
+/*
+ * `cf_callback_mode_plugindir'
+ *   Change the plugin directory
+ *
+ * <Mode xxx>
+ *   PluginDir `value'
+ * </Mode>
+ */
+static int cf_callback_mode_plugindir (const char *shortvar, const char *var,
+		const char *arguments, const char *value, lc_flags_t flags,
+		void *extra)
+{
+	DEBUG_CALLBACK (shortvar, var, arguments, value);
+
+	plugin_set_dir (value);
 
 	return (LC_CBRET_OKAY);
 }
 
-int cf_callback_options_mode (const char *shortvar, const char *var,
+static int cf_callback_mode_option (const char *shortvar, const char *var,
 		const char *arguments, const char *value, lc_flags_t flags,
 		void *extra)
 {
 	cf_mode_item_t *item;
 
+	DEBUG_CALLBACK (shortvar, var, arguments, value);
+
 	if (extra == NULL)
 	{
 		fprintf (stderr, "No extra..?\n");
@@ -279,63 +332,83 @@ int cf_callback_options_mode (const char *shortvar, const char *var,
 	return (LC_CBRET_OKAY);
 }
 
-int cf_callback_section_mode (const char *shortvar, const char *var,
+/*
+ * `cf_callback_mode_loadmodule':
+ *   Load a plugin.
+ *
+ * <Mode xxx>
+ *   LoadPlugin `value'
+ * </Mode>
+ */
+static int cf_callback_mode_loadmodule (const char *shortvar, const char *var,
 		const char *arguments, const char *value, lc_flags_t flags,
 		void *extra)
 {
-	DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
-			shortvar, var, arguments, value);
+	DEBUG_CALLBACK (shortvar, var, arguments, value);
 
-	if (flags == LC_FLAGS_SECTIONSTART)
-	{
-		if (nesting_depth != 0)
-		{
-			fprintf (stderr, ERR_NOT_NESTED);
-			return (LC_CBRET_ERROR);
-		}
+	if (plugin_load (value))
+		syslog (LOG_ERR, "plugin_load (%s): failed to load plugin", value);
 
-		if (arguments == NULL)
-		{
-			fprintf (stderr, ERR_NEEDS_ARG, shortvar);
-			return (LC_CBRET_ERROR);
-		}
+	/* Return `okay' even if there was an error, because it's not a syntax
+	 * problem.. */
+	return (LC_CBRET_OKAY);
+}
 
-		nesting_depth++;
+static int cf_callback_socket (const char *shortvar, const char *var,
+		const char *arguments, const char *value, lc_flags_t flags,
+		void *extra)
+{
+	char *buffer;
 
-		if (((operating_mode == MODE_CLIENT)
-					&& (strcasecmp (arguments, "Client") == 0))
-				|| ((operating_mode == MODE_SERVER)
-					&& (strcasecmp (arguments, "Server") == 0))
-				|| ((operating_mode == MODE_LOCAL)
-					&& (strcasecmp (arguments, "Local") == 0)))
-		{
-			return (LC_CBRET_OKAY);
-		}
-		else
-		{
-			return (LC_CBRET_IGNORESECTION);
-		}
-	}
-	else if (flags == LC_FLAGS_SECTIONEND)
-	{
-		nesting_depth--;
+	char *fields[3];
+	int   numfields;
 
-		return (LC_CBRET_OKAY);
-	}
-	else
+	char *node;
+	char *service = NET_DEFAULT_PORT;
+
+	DEBUG_CALLBACK (shortvar, var, arguments, value);
+
+	buffer = strdup (value);
+	if (buffer == NULL)
+		return (LC_CBRET_ERROR);
+
+	numfields = strsplit (buffer, fields, 3);
+
+	if ((numfields != 1) && (numfields != 2))
 	{
-		fprintf (stderr, ERR_SECTION_ONLY, shortvar);
+		syslog (LOG_ERR, "Invalid number of arguments to `%s'",
+				shortvar);
+		free (buffer);
 		return (LC_CBRET_ERROR);
 	}
 
+	node = fields[0];
+	if (numfields == 2)
+		service = fields[1];
+
+	/* Still return `LC_CBRET_OKAY' because this is not an syntax error */
+	if (network_create_socket (node, service) < 1)
+		syslog (LOG_ERR, "network_create_socket (%s, %s) failed",
+				node, service);
+
+	free (buffer);
+
+	return (LC_CBRET_OKAY);
 }
 
-int cf_callback_section_module (const char *shortvar, const char *var,
+/*
+ * `cf_callback_plugin'
+ *   Start/end section `plugin'
+ *
+ * <Plugin `arguments'>
+ *   ...
+ * </Plugin>
+ */
+static int cf_callback_plugin (const char *shortvar, const char *var,
 		const char *arguments, const char *value, lc_flags_t flags,
 		void *extra)
 {
-	DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
-			shortvar, var, arguments, value);
+	DEBUG_CALLBACK (shortvar, var, arguments, value);
 
 	if (flags == LC_FLAGS_SECTIONSTART)
 	{
@@ -383,63 +456,86 @@ int cf_callback_section_module (const char *shortvar, const char *var,
 	}
 }
 
-int cf_callback_loadmodule (const char *shortvar, const char *var,
+/*
+ * `cf_callback_plugin_dispatch'
+ *   Send options within `plugin' sections to the plugin that requests it.
+ *
+ * <Plugin `current_module'>
+ *   `var' `value'
+ * </Plugin>
+ */
+static int cf_callback_plugin_dispatch (const char *shortvar, const char *var,
 		const char *arguments, const char *value, lc_flags_t flags,
 		void *extra)
 {
-	DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
-			shortvar, var, arguments, value);
+	DEBUG_CALLBACK (shortvar, var, arguments, value);
 
-	if (nesting_depth == 0)
+	if ((nesting_depth == 0) || (current_module == NULL))
 	{
 		fprintf (stderr, ERR_NEEDS_SECTION, shortvar);
 		return (LC_CBRET_ERROR);
 	}
 
-	if (plugin_load (value))
-		syslog (LOG_ERR, "plugin_load (%s): failed to load plugin", shortvar);
+	/* Send the data to the plugin */
+	if (cf_dispatch (current_module, shortvar, value) < 0)
+		return (LC_CBRET_ERROR);
 
-	/* Return `okay' even if there was an error, because it's not a syntax
-	 * problem.. */
 	return (LC_CBRET_OKAY);
 }
 
-int cf_read (char *filename)
+static void cf_init (void)
 {
+	static int run_once = 0;
 	int i;
 
-	if (filename == NULL)
-		filename = CONFIGFILE;
+	if (run_once != 0)
+		return;
+	run_once = 1;
 
-	lc_register_callback ("Mode", SHORTOPT_NONE, LC_VAR_SECTION,
-			cf_callback_section_mode, NULL);
+	lc_register_callback ("Mode", SHORTOPT_NONE, LC_VAR_STRING,
+			cf_callback_mode, NULL);
 	lc_register_callback ("Plugin", SHORTOPT_NONE, LC_VAR_SECTION,
-			cf_callback_section_module, NULL);
+			cf_callback_plugin, NULL);
+
+	lc_register_callback ("PluginDir", SHORTOPT_NONE,
+			LC_VAR_STRING, cf_callback_mode_plugindir, NULL);
+	lc_register_callback ("LoadPlugin", SHORTOPT_NONE,
+			LC_VAR_STRING, cf_callback_mode_loadmodule, NULL);
 
-	lc_register_callback ("Mode.LoadPlugin", SHORTOPT_NONE,
-			LC_VAR_STRING, cf_callback_loadmodule,
-			NULL);
+	lc_register_callback ("Listen", SHORTOPT_NONE,
+			LC_VAR_STRING, cf_callback_socket, NULL);
+	lc_register_callback ("Server", SHORTOPT_NONE,
+			LC_VAR_STRING, cf_callback_socket, NULL);
 
 	for (i = 0; i < cf_mode_num; i++)
 	{
-		char            longvar[256];
 		cf_mode_item_t *item;
 
 		item = &cf_mode_list[i];
 
-		if (snprintf (longvar, 256, "Mode.%s", item->key) >= 256)
-			continue;
-
-		lc_register_callback (longvar, SHORTOPT_NONE, LC_VAR_STRING,
-				cf_callback_options_mode, (void *) item);
+		lc_register_callback (item->key, SHORTOPT_NONE, LC_VAR_STRING,
+				cf_callback_mode_option, (void *) item);
 	}
+}
 
+int cf_read (char *filename)
+{
+	cf_init ();
+
+	if (filename == NULL)
+		filename = CONFIGFILE;
+
+	DBG ("Starting to parse file `%s'", filename);
+
+	/* int lc_process_file(const char *appname, const char *pathname, lc_conf_type_t type); */
 	if (lc_process_file ("collectd", filename, LC_CONF_APACHE))
 	{
 		syslog (LOG_ERR, "lc_process_file (%s): %s", filename, lc_geterrstr ());
 		return (-1);
 	}
 
+	DBG ("Done parsing file `%s'", filename);
+
 	/* free memory and stuff */
 	lc_cleanup ();