From 214c709caed745ea0b844a94c1605c7063c26e50 Mon Sep 17 00:00:00 2001 From: loginator17 Date: Fri, 10 Oct 2014 18:30:47 +0100 Subject: [PATCH] Update write_http.c - adding Post timeout Adding PostTimeoutSec to set max timeout on http post --- src/write_http.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/write_http.c b/src/write_http.c index 1ab94382..b36a6978 100644 --- a/src/write_http.c +++ b/src/write_http.c @@ -62,6 +62,7 @@ struct wh_callback_s _Bool abort_on_slow; int low_limit_bytes; time_t interval; + int post_timeout; #define WH_FORMAT_COMMAND 0 #define WH_FORMAT_JSON 1 @@ -129,6 +130,10 @@ static int wh_callback_init (wh_callback_t *cb) /* {{{ */ 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); @@ -523,6 +528,7 @@ static int wh_config_url (oconfig_item_t *ci) /* {{{ */ 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); @@ -590,6 +596,8 @@ static int wh_config_url (oconfig_item_t *ci) /* {{{ */ 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 " -- 2.11.0