projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
battery plugin: Implement the "ReportDegraded" option.
[collectd.git]
/
src
/
curl_json.c
diff --git
a/src/curl_json.c
b/src/curl_json.c
index
6a01590
..
8a084fe
100644
(file)
--- a/
src/curl_json.c
+++ b/
src/curl_json.c
@@
-595,6
+595,11
@@
static int cj_init_curl (cj_t *db) /* {{{ */
if (db->user != NULL)
{
if (db->user != NULL)
{
+#ifdef HAVE_CURLOPT_USERNAME
+ curl_easy_setopt (db->curl, CURLOPT_USERNAME, db->user);
+ curl_easy_setopt (db->curl, CURLOPT_PASSWORD,
+ (db->pass == NULL) ? "" : db->pass);
+#else
size_t credentials_size;
credentials_size = strlen (db->user) + 2;
size_t credentials_size;
credentials_size = strlen (db->user) + 2;
@@
-611,13
+616,10
@@
static int cj_init_curl (cj_t *db) /* {{{ */
ssnprintf (db->credentials, credentials_size, "%s:%s",
db->user, (db->pass == NULL) ? "" : db->pass);
curl_easy_setopt (db->curl, CURLOPT_USERPWD, db->credentials);
ssnprintf (db->credentials, credentials_size, "%s:%s",
db->user, (db->pass == NULL) ? "" : db->pass);
curl_easy_setopt (db->curl, CURLOPT_USERPWD, db->credentials);
-
+#endif
+
if (db->digest)
if (db->digest)
- {
curl_easy_setopt (db->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
curl_easy_setopt (db->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
- curl_easy_setopt (db->curl, CURLOPT_USERNAME, db->user);
- curl_easy_setopt (db->curl, CURLOPT_PASSWORD, db->pass);
- }
}
curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, (long) db->verify_peer);
}
curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, (long) db->verify_peer);
@@
-726,7
+728,7
@@
static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */
if (status == 0)
{
user_data_t ud;
if (status == 0)
{
user_data_t ud;
- char
cb_name[DATA_MAX_NAME_LEN]
;
+ char
*cb_name
;
struct timespec interval = { 0, 0 };
CDTIME_T_TO_TIMESPEC (db->interval, &interval);
struct timespec interval = { 0, 0 };
CDTIME_T_TO_TIMESPEC (db->interval, &interval);
@@
-741,12
+743,13
@@
static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */
ud.data = (void *) db;
ud.free_func = cj_free;
ud.data = (void *) db;
ud.free_func = cj_free;
-
ssnprintf (cb_name, sizeof (cb_name),
"curl_json-%s-%s",
+
cb_name = ssnprintf_alloc (
"curl_json-%s-%s",
db->instance, db->url ? db->url : db->sock);
plugin_register_complex_read (/* group = */ NULL, cb_name, cj_read,
/* interval = */ (db->interval > 0) ? &interval : NULL,
&ud);
db->instance, db->url ? db->url : db->sock);
plugin_register_complex_read (/* group = */ NULL, cb_name, cj_read,
/* interval = */ (db->interval > 0) ? &interval : NULL,
&ud);
+ sfree (cb_name);
}
else
{
}
else
{
@@
-975,9
+978,18
@@
static int cj_read (user_data_t *ud) /* {{{ */
return cj_perform (db);
} /* }}} int cj_read */
return cj_perform (db);
} /* }}} int cj_read */
+static int cj_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 cj_init */
+
void module_register (void)
{
plugin_register_complex_config ("curl_json", cj_config);
void module_register (void)
{
plugin_register_complex_config ("curl_json", cj_config);
+ plugin_register_init ("curl_json", cj_init);
} /* void module_register */
/* vim: set sw=2 sts=2 et fdm=marker : */
} /* void module_register */
/* vim: set sw=2 sts=2 et fdm=marker : */