Limit wait time for writes in mqtt output (influxdata#3699)

(cherry picked from commit 91fc276)
signalfx · Jun 19, 2018 · 5432627 · 5432627
1 parent c09c96e
commit 5432627
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/plugins/outputs/mqtt/mqtt.go b/plugins/outputs/mqtt/mqtt.go
@@ -33,6 +33,9 @@ var sampleConfig = `
   # username = "telegraf"
   # password = "metricsmetricsmetricsmetrics"
 
+  ## Timeout for write operations. default: 5s
+  # timeout = "5s"
+
   ## client ID, if not set a random ID is generated
   # client_id = ""
 
@@ -191,6 +194,11 @@ func (m *MQTT) createOpts() (*paho.ClientOptions, error) {
 	}
 	opts.WriteTimeout = m.Timeout.Duration
 
+	if m.Timeout.Duration < time.Second {
+		m.Timeout.Duration = 5 * time.Second
+	}
+	opts.WriteTimeout = m.Timeout.Duration
+
 	if m.ClientID != "" {
 		opts.SetClientID(m.ClientID)
 	} else {