diff --git a/src/write_http.c b/src/write_http.c
index 8d3b85b366079e75232a5ff8dcfd9a586aa39c61..0e1bc734a1d4341b64cfc59274c785d849422cec 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 post_timeout;
#define WH_FORMAT_COMMAND 0
#define WH_FORMAT_JSON 1
return (-1);
}
+ if (cb->abort_on_slow && cb->interval > 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);
+ }
+
+ if (cb->post_timeout > 0)
+ curl_easy_setopt (cb->curl, CURLOPT_TIMEOUT, cb->post_timeout);
+
curl_easy_setopt (cb->curl, CURLOPT_NOSIGNAL, 1L);
curl_easy_setopt (cb->curl, CURLOPT_USERAGENT, COLLECTD_USERAGENT);
@@ -361,6 +376,7 @@ 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)
{
@@ -409,6 +425,8 @@ 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->post_timeout = 0;
pthread_mutex_init (&cb->send_lock, /* attr = */ NULL);
cf_util_get_boolean (child, &cb->store_rates);
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);
+ else if (strcasecmp ("PostTimeoutSec", child->key) == 0)
+ cf_util_get_int (child, &cb->post_timeout);
else
{
ERROR ("write_http plugin: Invalid configuration "
return (-1);
}
+ if (cb->abort_on_slow)
+ cb->interval = CDTIME_T_TO_TIME_T(plugin_get_interval());
+
+ if (cb->post_timeout == 0)
+ //setting default timeout to plugin interval.
+ cb->post_timeout = CDTIME_T_TO_TIME_T(plugin_get_interval());
+
/* Determine send_buffer_size. */
cb->send_buffer_size = WRITE_HTTP_DEFAULT_BUFFER_SIZE;
if (buffer_size >= 1024)