author | Florian Forster <octo@collectd.org> | |
Sat, 13 Jul 2013 09:23:32 +0000 (11:23 +0200) | ||
committer | Florian Forster <octo@collectd.org> | |
Sat, 13 Jul 2013 09:23:32 +0000 (11:23 +0200) |
src/plugin.c | patch | blob | history | |
src/write_graphite.c | patch | blob | history |
diff --git a/src/plugin.c b/src/plugin.c
index 4c6a0322f18200f92caee47adbe41ab089ee94f5..d3767d1283b9678bec65e8665d5feb7b8c64bef7 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
(void *) callback, /* user_data = */ NULL));
} /* int plugin_register_shutdown */
+static void plugin_free_data_sets (void)
+{
+ void *key;
+ void *value;
+
+ if (data_sets == NULL)
+ return;
+
+ while (c_avl_pick (data_sets, &key, &value) == 0)
+ {
+ data_set_t *ds = value;
+ /* key is a pointer to ds->type */
+
+ sfree (ds->ds);
+ sfree (ds);
+ }
+
+ c_avl_destroy (data_sets);
+ data_sets = NULL;
+} /* void plugin_free_data_sets */
+
int plugin_register_data_set (const data_set_t *ds)
{
data_set_t *ds_copy;
destroy_all_callbacks (&list_notification);
destroy_all_callbacks (&list_shutdown);
destroy_all_callbacks (&list_log);
+
+ plugin_free_data_sets ();
} /* void plugin_shutdown_all */
int plugin_dispatch_missing (const value_list_t *vl) /* {{{ */
diff --git a/src/write_graphite.c b/src/write_graphite.c
index 949a8425178f700b952787f15bc0426f4f6d7299..99c6f4d80a91a669ee0ac86f0bfe0620de6bb13f 100644 (file)
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
"write_graphite plugin: Connecting to %s:%s failed. "
"The last error was: %s", node, service,
sstrerror (errno, errbuf, sizeof (errbuf)));
- close (cb->sock_fd);
return (-1);
}
else
wg_flush_nolock (/* timeout = */ 0, cb);
- close(cb->sock_fd);
- cb->sock_fd = -1;
+ if (cb->sock_fd >= 0)
+ {
+ close (cb->sock_fd);
+ cb->sock_fd = -1;
+ }
sfree(cb->name);
sfree(cb->node);
return (status);
/* Send the message to graphite */
- wg_send_message (buffer, cb);
- if (status != 0)
- {
- /* An error message has already been printed. */
+ status = wg_send_message (buffer, cb);
+ if (status != 0) /* error message has been printed already. */
return (status);
- }
return (0);
} /* int wg_write_messages */