From: Marc Fournier Date: Thu, 2 Apr 2015 16:29:05 +0000 (+0200) Subject: curl: adapt Timeout doc bits to new behaviour X-Git-Tag: collectd-5.5.0~56^2~7 X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=328fc70ebb2a2bdfe7c63a3945a52c10e1490291 curl: adapt Timeout doc bits to new behaviour Also clarify the ins and outs of stalled network connections regarding threads consumption and add warning about timeouts and MeasureResponseTime. --- diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod index 6b76c911..9dd162e2 100644 --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod @@ -1455,6 +1455,10 @@ C). Measure response time for the request. If this setting is enabled, B blocks (see below) are optional. Disabled by default. +Beware that requests will get aborted if they take too long to complete. Adjust +B accordingly if you expect B to report such slow +requests. + =item B B|B Measure response code for the request. If this setting is enabled, B @@ -1469,13 +1473,17 @@ plugin below on how matches are defined. If the B or B options are set to B, B blocks are optional. -=item B I +=item B I + +The B option sets the overall timeout for HTTP requests, in +milliseconds. By default, the configured B is used to set the +timeout. Prior to version 5.5.0, there was no timeout and requests could hang +indefinitely. This legacy behaviour can be achieved by setting the value of +B to 0. -The B option sets the overall timeout for each request. Make sure that -collectd is configured with enough C, otherwise an overly long -timeout could block other plugins. By default or when set to B<0>, a timeout -equal to the B is used. Prior to version 5.5.0, there was no timeout -and requests might hang indefinitely. +If B is 0 or bigger than the B, keep in mind that each slow +network connection will stall one read thread. Adjust the B global +setting accordingly to prevent this from blocking other plugins. =back @@ -1562,7 +1570,8 @@ URL. By default the global B setting will be used. =item B
I
=item B I -=item B I + +=item B I These options behave exactly equivalent to the appropriate options of the I plugin. Please see there for a detailed description.