From 022262eb7878c74bef4ce895056e9de8deb7cf14 Mon Sep 17 00:00:00 2001
From: Fabio Manganiello <blacklight86@gmail.com>
Date: Thu, 7 Mar 2019 23:03:12 +0100
Subject: [PATCH] Handle MQTT listeners by host with lists of topics, so we
only need one listener thread per host
---
platypush/backend/mqtt.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/platypush/backend/mqtt.py b/platypush/backend/mqtt.py
index 56b434768..9ff996317 100644
--- a/platypush/backend/mqtt.py
+++ b/platypush/backend/mqtt.py
@@ -116,9 +116,10 @@ class MqttBackend(Backend):
client.connect(host, port, 60)
client.loop_forever()
- def on_connect(topic):
+ def on_connect(topics):
def handler(client, userdata, flags, rc):
- client.subscribe(topic)
+ for topic in topics:
+ client.subscribe(topic)
return handler
def on_message(client, userdata, msg):
@@ -135,18 +136,18 @@ class MqttBackend(Backend):
for i, listener in enumerate(listeners_conf):
host = listener.get('host')
port = listener.get('port', self._default_mqtt_port)
- topic = listener.get('topic')
+ topics = listener.get('topics')
username = listener.get('username')
password = listener.get('password')
tls_cafile = listener.get('tls_cafile')
- if not host or not topic:
- self.logger.warning('No host nor topic specified for listener ' +
- 'n.{}'.format(i+1))
+ if not host or not topics:
+ self.logger.warning('No host nor list of topics specified for ' +
+ 'listener n.{}'.format(i+1))
continue
client = mqtt.Client()
- client.on_connect = on_connect(topic)
+ client.on_connect = on_connect(topics)
client.on_message = on_message
if username and password: