]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
fix the case where libmosquitto doesn't have the second argument in mosquitto_loop... 2730/head
authorviulian <viulian@gmail.com>
Tue, 27 Mar 2018 22:00:57 +0000 (00:00 +0200)
committerviulian <viulian@gmail.com>
Tue, 27 Mar 2018 22:00:57 +0000 (00:00 +0200)
src/mqtt.c

index 09060dfa7df4d6cc7c8cc211ee947ceb9597aa9e..5c1ff1909b0c31e53f69493e937875b03df78b5b 100644 (file)
@@ -445,9 +445,13 @@ static int publish(mqtt_client_conf_t *conf, char const *topic,
     return -1;
   }
 
-  // -1 means default timeout, 1000ms
-  // second argument is unused, set to 1 for future compatibility
-  status = mosquitto_loop(conf->mosq, -1, 1);
+  #if LIBMOSQUITTO_MAJOR == 0
+    status = mosquitto_loop(conf->mosq, /* timeout = */ 1000 /* ms */);
+  #else
+    status = mosquitto_loop(conf->mosq,
+                            /* timeout[ms] = */ 1000,
+                            /* max_packets = */ 1);
+  #endif
 
   if (status != MOSQ_ERR_SUCCESS) {
     c_complain(LOG_ERR, &conf->complaint_cantpublish,