projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.3
[collectd.git]
/
src
/
write_http.c
diff --git
a/src/write_http.c
b/src/write_http.c
index
6b1c64a
..
34ea46d
100644
(file)
--- a/
src/write_http.c
+++ b/
src/write_http.c
@@
-88,7
+88,7
@@
static int wh_send_buffer (wh_callback_t *cb) /* {{{ */
curl_easy_setopt (cb->curl, CURLOPT_POSTFIELDS, cb->send_buffer);
status = curl_easy_perform (cb->curl);
curl_easy_setopt (cb->curl, CURLOPT_POSTFIELDS, cb->send_buffer);
status = curl_easy_perform (cb->curl);
- if (status !=
0
)
+ if (status !=
CURLE_OK
)
{
ERROR ("write_http plugin: curl_easy_perform failed with "
"status %i: %s",
{
ERROR ("write_http plugin: curl_easy_perform failed with "
"status %i: %s",
@@
-590,9
+590,18
@@
static int wh_config (oconfig_item_t *ci) /* {{{ */
return (0);
} /* }}} int wh_config */
return (0);
} /* }}} int wh_config */
+static int wh_init (void) /* {{{ */
+{
+ /* Call this while collectd is still single-threaded to avoid
+ * initialization issues in libgcrypt. */
+ curl_global_init (CURL_GLOBAL_SSL);
+ return (0);
+} /* }}} int wh_init */
+
void module_register (void) /* {{{ */
{
plugin_register_complex_config ("write_http", wh_config);
void module_register (void) /* {{{ */
{
plugin_register_complex_config ("write_http", wh_config);
+ plugin_register_init ("write_http", wh_init);
} /* }}} void module_register */
/* vim: set fdm=marker sw=8 ts=8 tw=78 et : */
} /* }}} void module_register */
/* vim: set fdm=marker sw=8 ts=8 tw=78 et : */