X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdaemon%2Fplugin.c;h=bfd220171ea2bf8a07d08d9372d5ecc8ffbf3d0a;hb=8c864f5e634118fce2446ebbba96a1cb7ec39dda;hp=25bd37b8983aa40d0fa366914c7572f11c1598e6;hpb=979b0fa58b2de639ff79209eff12ec17ff593483;p=collectd.git

diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c
index 25bd37b8..bfd22017 100644
--- a/src/daemon/plugin.c
+++ b/src/daemon/plugin.c
@@ -307,6 +307,56 @@ static int register_callback (llist_t **list, /* {{{ */
 	return (0);
 } /* }}} int register_callback */
 
+static void log_list_callbacks (llist_t **list, /* {{{ */
+				const char *comment)
+{
+	char *str;
+	int len;
+	llentry_t *le;
+	int i;
+	int n;
+	char **keys;
+
+	n = llist_size(*list);
+	if (n == 0)
+	{
+		INFO("%s [none]", comment);
+		return;
+	}
+
+	keys = calloc(n, sizeof(char*));
+
+	if (keys == NULL)
+	{
+		ERROR("%s: failed to allocate memory for list of callbacks",
+		      comment);
+
+		return;
+	}
+
+	for (le = llist_head (*list), i = 0, len = 0;
+	     le != NULL;
+	     le = le->next, i++)
+	{
+		keys[i] = le->key;
+		len += strlen(le->key) + 6;
+	}
+	str = malloc(len + 10);
+	if (str == NULL)
+	{
+		ERROR("%s: failed to allocate memory for list of callbacks",
+		      comment);
+	}
+	else
+	{
+		*str = '\0';
+		strjoin(str, len, keys, n, "', '");
+		INFO("%s ['%s']", comment, str);
+		free(str);
+	}
+	free(keys);
+} /* }}} void log_list_callbacks */
+
 static int create_register_callback (llist_t **list, /* {{{ */
 		const char *name, void *callback, user_data_t *ud)
 {
@@ -1187,8 +1237,10 @@ int plugin_register_read (const char *name,
 	rf->rf_interval = plugin_get_interval ();
 
 	status = plugin_insert_read (rf);
-	if (status != 0)
+	if (status != 0) {
+		sfree (rf->rf_name);
 		sfree (rf);
+	}
 
 	return (status);
 } /* int plugin_register_read */
@@ -1235,8 +1287,10 @@ int plugin_register_complex_read (const char *group, const char *name,
 	rf->rf_ctx = plugin_get_ctx ();
 
 	status = plugin_insert_read (rf);
-	if (status != 0)
+	if (status != 0) {
+		sfree (rf->rf_name);
 		sfree (rf);
+	}
 
 	return (status);
 } /* int plugin_register_complex_read */
@@ -1398,6 +1452,11 @@ int plugin_unregister_read (const char *name) /* {{{ */
 	return (0);
 } /* }}} int plugin_unregister_read */
 
+void plugin_log_available_writers (void)
+{
+	log_list_callbacks (&list_write, "Available write targets:");
+}
+
 static int compare_read_func_group (llentry_t *e, void *ud) /* {{{ */
 {
 	read_func_t *rf    = e->value;
@@ -1665,6 +1724,7 @@ int plugin_read_all_once (void)
 			return_status = -1;
 		}
 
+		sfree (rf->rf_name);
 		destroy_callback ((void *) rf);
 	}