projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3010 from rpv-tomsk/collectd-5.8
[collectd.git]
/
src
/
write_graphite.c
diff --git
a/src/write_graphite.c
b/src/write_graphite.c
index
206cdc2
..
7d7c0e8
100644
(file)
--- a/
src/write_graphite.c
+++ b/
src/write_graphite.c
@@
-312,6
+312,7
@@
static void wg_callback_free(void *data) {
sfree(cb->prefix);
sfree(cb->postfix);
sfree(cb->prefix);
sfree(cb->postfix);
+ pthread_mutex_unlock(&cb->send_lock);
pthread_mutex_destroy(&cb->send_lock);
sfree(cb);
pthread_mutex_destroy(&cb->send_lock);
sfree(cb);
@@
-545,11
+546,11
@@
static int wg_config_node(oconfig_item_t *ci) {
/* FIXME: Legacy configuration syntax. */
if (cb->name == NULL)
/* FIXME: Legacy configuration syntax. */
if (cb->name == NULL)
- s
s
nprintf(callback_name, sizeof(callback_name), "write_graphite/%s/%s/%s",
-
cb->node, cb->service, cb->protocol);
+ snprintf(callback_name, sizeof(callback_name), "write_graphite/%s/%s/%s",
+ cb->node, cb->service, cb->protocol);
else
else
- s
s
nprintf(callback_name, sizeof(callback_name), "write_graphite/%s",
-
cb->name);
+ snprintf(callback_name, sizeof(callback_name), "write_graphite/%s",
+ cb->name);
plugin_register_write(callback_name, wg_write,
&(user_data_t){
plugin_register_write(callback_name, wg_write,
&(user_data_t){