diff --git a/src/write_http.c b/src/write_http.c
index 2c59d64b4ddbb8eae93e02903a5cc8d7f97881a1..ed596bbf56b9e9ee88becd425126951a4591fb91 100644 (file)
--- a/src/write_http.c
+++ b/src/write_http.c
# define WRITE_HTTP_DEFAULT_BUFFER_SIZE 4096
#endif
-#define WH_DEFAULT_LOW_LIMIT_BYTES_PER_SEC 100
/*
* Private variables
*/
char *clientkeypass;
long sslversion;
_Bool store_rates;
- _Bool abort_on_slow;
- int low_limit_bytes;
- time_t interval;
+ int low_speed_limit;
+ time_t low_speed_time;
int timeout;
#define WH_FORMAT_COMMAND 0
return (-1);
}
- if (cb->abort_on_slow && cb->interval > 0)
+ if (cb->low_speed_limit > 0 && cb->low_speed_time > 0)
{
curl_easy_setopt (cb->curl, CURLOPT_LOW_SPEED_LIMIT,
- (cb->low_limit_bytes ? cb->low_limit_bytes : WH_DEFAULT_LOW_LIMIT_BYTES_PER_SEC));
- curl_easy_setopt (cb->curl, CURLOPT_LOW_SPEED_TIME, cb->interval);
+ (long) (cb->low_speed_limit * cb->low_speed_time));
+ curl_easy_setopt (cb->curl, CURLOPT_LOW_SPEED_TIME,
+ (long) cb->low_speed_time);
}
+#ifdef HAVE_CURLOPT_TIMEOUT_MS
if (cb->timeout > 0)
- curl_easy_setopt (cb->curl, CURLOPT_TIMEOUT_MS, cb->timeout);
+ curl_easy_setopt (cb->curl, CURLOPT_TIMEOUT_MS, (long) cb->timeout);
+#endif
curl_easy_setopt (cb->curl, CURLOPT_NOSIGNAL, 1L);
curl_easy_setopt (cb->curl, CURLOPT_USERAGENT, COLLECTD_USERAGENT);
@@ -376,7 +377,6 @@ static int wh_write_command (const data_set_t *ds, const value_list_t *vl, /* {{
if (cb->curl == NULL)
{
- cb->interval = CDTIME_T_TO_TIME_T(vl->interval);
status = wh_callback_init (cb);
if (status != 0)
{
@@ -425,8 +425,6 @@ static int wh_write_json (const data_set_t *ds, const value_list_t *vl, /* {{{ *
if (cb->curl == NULL)
{
- cb->interval = CDTIME_T_TO_TIME_T(vl->interval);
-
status = wh_callback_init (cb);
if (status != 0)
{
cb->verify_host = 1;
cb->format = WH_FORMAT_COMMAND;
cb->sslversion = CURL_SSLVERSION_DEFAULT;
- cb->low_limit_bytes = WH_DEFAULT_LOW_LIMIT_BYTES_PER_SEC;
+ cb->low_speed_limit = 0;
cb->timeout = 0;
pthread_mutex_init (&cb->send_lock, /* attr = */ NULL);
else if (strcasecmp ("BufferSize", child->key) == 0)
cf_util_get_int (child, &buffer_size);
else if (strcasecmp ("LowSpeedLimit", child->key) == 0)
- cf_util_get_boolean (child,&cb->abort_on_slow);
- else if (strcasecmp ("LowLimitBytesPerSec", child->key) == 0)
- cf_util_get_int (child, &cb->low_limit_bytes);
+ cf_util_get_int (child, &cb->low_speed_limit);
else if (strcasecmp ("Timeout", child->key) == 0)
cf_util_get_int (child, &cb->timeout);
else
return (-1);
}
- if (cb->abort_on_slow)
- cb->interval = CDTIME_T_TO_TIME_T(plugin_get_interval());
+ if (cb->low_speed_limit > 0)
+ cb->low_speed_time = CDTIME_T_TO_TIME_T(plugin_get_interval());
/* Determine send_buffer_size. */
cb->send_buffer_size = WRITE_HTTP_DEFAULT_BUFFER_SIZE;