Update write_http.c - adding Post timeout

[collectd.git] / src / write_http.c

diff --git a/src/write_http.c b/src/write_http.c
index 80f42ab..b36a697 100644 (file)
--- a/src/write_http.c
+++ b/src/write_http.c
@@ -39,6 +39,7 @@
 # define WRITE_HTTP_DEFAULT_BUFFER_SIZE 4096
 #endif
 
+#define WH_DEFAULT_LOW_LIMIT_BYTES_PER_SEC 100
 /*
  * Private variables
  */
@@ -57,9 +58,11 @@ struct wh_callback_s
         char *clientcert;
         char *clientkeypass;
         long sslversion;
-        _Bool store_rates;
-       int   abort_on_slow;
+        _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
@@ -124,9 +127,13 @@ static int wh_callback_init (wh_callback_t *cb) /* {{{ */
 
         if(cb->abort_on_slow && cb->interval > 0)
         {
-            curl_easy_setopt(cb->curl, CURLOPT_LOW_SPEED_LIMIT, 100);
+            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);
@@ -355,12 +362,11 @@ static int wh_write_command (const data_set_t *ds, const value_list_t *vl, /* {{
                 return (-1);
         }
 
-               cb->interval = CDTIME_T_TO_TIME_T(vl->interval);
-               
         pthread_mutex_lock (&cb->send_lock);
 
         if (cb->curl == NULL)
         {
+                cb->interval = CDTIME_T_TO_TIME_T(vl->interval);
                 status = wh_callback_init (cb);
                 if (status != 0)
                 {
@@ -405,12 +411,12 @@ static int wh_write_json (const data_set_t *ds, const value_list_t *vl, /* {{{ *
 {
         int status;
                
-               cb->interval = CDTIME_T_TO_TIME_T(vl->interval);
-
         pthread_mutex_lock (&cb->send_lock);
 
         if (cb->curl == NULL)
         {
+                cb->interval = CDTIME_T_TO_TIME_T(vl->interval);
+
                 status = wh_callback_init (cb);
                 if (status != 0)
                 {
@@ -521,6 +527,8 @@ static int wh_config_url (oconfig_item_t *ci) /* {{{ */
         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);
 
@@ -584,8 +592,12 @@ static int wh_config_url (oconfig_item_t *ci) /* {{{ */
                         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)
-                        config_set_boolean (&cb->abort_on_slow, child);
+                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 "