lukmangrd/platypush
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make sure that the shitty MQTT backend doesn't break for no reason

Browse source
This commit is contained in:
Fabio Manganiello 2018-11-06 11:40:01 +01:00
parent cbfcb76c21
commit 26ec213098
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
platypush/backend/mqtt.py
View file

@ -79,6 +79,7 @@ class MqttBackend(Backend):
def send_message(self, msg): def send_message(self, msg):
try:
client = get_plugin('mqtt') client = get_plugin('mqtt')
client.send_message(topic=self.topic, msg=msg, host=self.host, client.send_message(topic=self.topic, msg=msg, host=self.host,
port=self.port, username=self.username, port=self.port, username=self.username,
@ -87,6 +88,8 @@ class MqttBackend(Backend):
tls_keyfile=self.tls_keyfile, tls_keyfile=self.tls_keyfile,
tls_version=self.tls_version, tls_version=self.tls_version,
tls_ciphers=self.tls_ciphers) tls_ciphers=self.tls_ciphers)
except Exception as e:
self.logger.exception(e)
def run(self): def run(self):
def on_connect(client, userdata, flags, rc): def on_connect(client, userdata, flags, rc):
@ -100,21 +103,18 @@ class MqttBackend(Backend):
self.logger.info('Processing response on the MQTT topic {}: {}'. self.logger.info('Processing response on the MQTT topic {}: {}'.
format(response_topic, response)) format(response_topic, response))
client = get_plugin('mqtt') self.send_message(response)
client.send_message(topic=self.topic, msg=response, host=self.host,
port=self.port, username=self.username,
password=self.password, tls_cafile=self.tls_cafile,
tls_certfile=self.tls_certfile,
tls_keyfile=self.tls_keyfile,
tls_version=self.tls_version,
tls_ciphers=self.tls_ciphers)
msg = msg.payload.decode('utf-8') msg = msg.payload.decode('utf-8')
try: msg = Message.build(json.loads(msg)) try: msg = Message.build(json.loads(msg))
except: pass except: pass
self.logger.info('Received message on the MQTT backend: {}'.format(msg)) self.logger.info('Received message on the MQTT backend: {}'.format(msg))
try:
self.on_message(msg) self.on_message(msg)
except Exception as e:
self.logger.exception(e)
if isinstance(msg, Request): if isinstance(msg, Request):
threading.Thread(target=response_thread, args=(msg,)).start() threading.Thread(target=response_thread, args=(msg,)).start()