write_http: control rate using only one parameter

- do not enable the feature with an on/off switch. Enable it by setting
  a positive value to the parameter instead. Therefore drop the
  arbitrary default value used previously.

- rename LowLimitBytesPerSec to LowSpeedLimit.

- make LowSpeedLimit refer to bytes per second rather than bytes per
  Interval.

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 092f0b5ca74bf1c1cebe09146fb93d9a6b9d9279..1b2f5f8101b58603d597f37449cdd40cd8a46e77 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -7138,16 +7138,12 @@ are available on the server side. I<Bytes> must be at least 1024 and cannot
 exceed the size of an C<int>, i.e. 2E<nbsp>GByte.
 Defaults to C<4096>.
 
-=item B<LowSpeedLimit> B<true|false>
+=item B<LowSpeedLimit> I<Bytes per Second>
 
-If set to B<true>, average transfer speed in bytes per second will be checked.
-In case it is below B<LowLimitBytesPerSec> connection will be considered slow
-and aborted.
-
-=item B<LowLimitBytesPerSec> I<Bytes>
-
-Sets bytes per second value for B<LowSpeedLimit> to make a decission if
-connection is too slow. Default value is C<100>.
+Sets the minimal transfer rate in I<Bytes per Second> below which the
+connection with the HTTP server will be considered too slow and aborted. All
+the data submitted over this connection will probably be lost. Defaults to 0,
+which means no minimum transfer rate is enforced.
 
 =item B<Timeout> I<Timeout>
 

diff --git a/src/write_http.c b/src/write_http.c
index 2c59d64b4ddbb8eae93e02903a5cc8d7f97881a1..ad4dd8a4bad7e2bcf14ede0c92600d2bfcb19839 100644 (file)
--- a/src/write_http.c
+++ b/src/write_http.c
@@ -39,7 +39,6 @@
 # define WRITE_HTTP_DEFAULT_BUFFER_SIZE 4096
 #endif
 
-#define WH_DEFAULT_LOW_LIMIT_BYTES_PER_SEC 100
 /*
  * Private variables
  */
@@ -60,9 +59,8 @@ struct wh_callback_s
         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
@@ -126,11 +124,12 @@ static int wh_callback_init (wh_callback_t *cb) /* {{{ */
                 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);
+                                  (cb->low_speed_limit * cb->low_speed_time));
+                curl_easy_setopt (cb->curl, CURLOPT_LOW_SPEED_TIME,
+                                  cb->low_speed_time);
         }
 
         if (cb->timeout > 0)
@@ -376,7 +375,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 +423,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)
                 {
@@ -538,7 +534,7 @@ static int wh_config_node (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->low_speed_limit = 0;
         cb->timeout = 0;
 
         pthread_mutex_init (&cb->send_lock, /* attr = */ NULL);
@@ -608,9 +604,7 @@ static int wh_config_node (oconfig_item_t *ci) /* {{{ */
                 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
@@ -628,8 +622,8 @@ static int wh_config_node (oconfig_item_t *ci) /* {{{ */
                 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;