projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netcmd plugin: Added a first version of a control socket plugin.
[collectd.git]
/
src
/
curl_json.c
diff --git
a/src/curl_json.c
b/src/curl_json.c
index
5128c87
..
937a237
100644
(file)
--- a/
src/curl_json.c
+++ b/
src/curl_json.c
@@
-651,6
+651,7
@@
static int cj_init_curl (cj_t *db) /* {{{ */
if (db->post_body != NULL)
curl_easy_setopt (db->curl, CURLOPT_POSTFIELDS, db->post_body);
if (db->post_body != NULL)
curl_easy_setopt (db->curl, CURLOPT_POSTFIELDS, db->post_body);
+#ifdef HAVE_CURLOPT_TIMEOUT_MS
if (db->timeout >= 0)
curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, (long) db->timeout);
else if (db->interval > 0)
if (db->timeout >= 0)
curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, (long) db->timeout);
else if (db->interval > 0)
@@
-659,6
+660,7
@@
static int cj_init_curl (cj_t *db) /* {{{ */
else
curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS,
CDTIME_T_TO_MS(plugin_get_interval()));
else
curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS,
CDTIME_T_TO_MS(plugin_get_interval()));
+#endif
return (0);
} /* }}} int cj_init_curl */
return (0);
} /* }}} int cj_init_curl */
@@
-761,9
+763,6
@@
static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */
{
user_data_t ud;
char *cb_name;
{
user_data_t ud;
char *cb_name;
- struct timespec interval = { 0, 0 };
-
- CDTIME_T_TO_TIMESPEC (db->interval, &interval);
if (db->instance == NULL)
db->instance = strdup("default");
if (db->instance == NULL)
db->instance = strdup("default");
@@
-779,7
+778,7
@@
static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */
db->instance, db->url ? db->url : db->sock);
plugin_register_complex_read (/* group = */ NULL, cb_name, cj_read,
db->instance, db->url ? db->url : db->sock);
plugin_register_complex_read (/* group = */ NULL, cb_name, cj_read,
- /* interval = */
(db->interval > 0) ? &interval : NULL
,
+ /* interval = */
db->interval
,
&ud);
sfree (cb_name);
}
&ud);
sfree (cb_name);
}