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

LINT fixes

Browse source
This commit is contained in:
Fabio Manganiello 2019-12-08 23:46:34 +01:00
parent f8a709fe98
commit 2c8993e67d
1 changed files with 37 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
platypush/backend/mqtt.py
View file

@ -41,19 +41,23 @@ class MqttBackend(Backend):
:param topic: Topic to read messages from (default: ``platypush_bus_mq/<device_id>``) :param topic: Topic to read messages from (default: ``platypush_bus_mq/<device_id>``)
:type topic: str :type topic: str
:param tls_cafile: If TLS/SSL is enabled on the MQTT server and the certificate requires a certificate authority to authenticate it, `ssl_cafile` will point to the provided ca.crt file (default: None) :param tls_cafile: If TLS/SSL is enabled on the MQTT server and the certificate requires a certificate authority
to authenticate it, `ssl_cafile` will point to the provided ca.crt file (default: None)
:type tls_cafile: str :type tls_cafile: str
:param tls_certfile: If TLS/SSL is enabled on the MQTT server and a client certificate it required, specify it here (default: None) :param tls_certfile: If TLS/SSL is enabled on the MQTT server and a client certificate it required, specify it
here (default: None)
:type tls_certfile: str :type tls_certfile: str
:param tls_keyfile: If TLS/SSL is enabled on the MQTT server and a client certificate key it required, specify it here (default: None) :param tls_keyfile: If TLS/SSL is enabled on the MQTT server and a client certificate key it required,
:type tls_keyfile: str specify it here (default: None) :type tls_keyfile: str
:param tls_version: If TLS/SSL is enabled on the MQTT server and it requires a certain TLS version, specify it here (default: None) :param tls_version: If TLS/SSL is enabled on the MQTT server and it requires a certain TLS version, specify it
here (default: None)
:type tls_version: str :type tls_version: str
:param tls_ciphers: If TLS/SSL is enabled on the MQTT server and an explicit list of supported ciphers is required, specify it here (default: None) :param tls_ciphers: If TLS/SSL is enabled on the MQTT server and an explicit list of supported ciphers is
required, specify it here (default: None)
:type tls_ciphers: str :type tls_ciphers: str
:param username: Specify it if the MQTT server requires authentication (default: None) :param username: Specify it if the MQTT server requires authentication (default: None)
@ -95,8 +99,7 @@ class MqttBackend(Backend):
self.tls_ciphers = tls_ciphers self.tls_ciphers = tls_ciphers
self.listeners_conf = listeners or [] self.listeners_conf = listeners or []
def send_message(self, msg, **kwargs):
def send_message(self, msg):
try: 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,
@ -112,24 +115,31 @@ class MqttBackend(Backend):
def _initialize_listeners(self, listeners_conf): def _initialize_listeners(self, listeners_conf):
import paho.mqtt.client as mqtt import paho.mqtt.client as mqtt
# noinspection PyShadowingNames
def listener_thread(client, host, port): def listener_thread(client, host, port):
client.connect(host, port, 60) client.connect(host, port, 60)
client.loop_forever() client.loop_forever()
# noinspection PyShadowingNames
def on_connect(topics): def on_connect(topics):
# noinspection PyShadowingNames,PyUnusedLocal
def handler(client, userdata, flags, rc): def handler(client, userdata, flags, rc):
for topic in topics: for topic in topics:
client.subscribe(topic) client.subscribe(topic)
return handler return handler
# noinspection PyShadowingNames,PyUnusedLocal
def on_message(client, userdata, msg): def on_message(client, userdata, msg):
data = msg.payload data = msg.payload
# noinspection PyBroadException
try: try:
data = data.decode('utf-8') data = data.decode('utf-8')
data = json.loads(data) data = json.loads(data)
except: except:
pass pass
# noinspection PyProtectedMember
self.bus.post(MQTTMessageEvent(host=client._host, port=client._port, self.bus.post(MQTTMessageEvent(host=client._host, port=client._port,
topic=msg.topic, msg=data)) topic=msg.topic, msg=data))
@ -143,7 +153,7 @@ class MqttBackend(Backend):
if not host or not topics: if not host or not topics:
self.logger.warning('No host nor list of topics specified for ' + self.logger.warning('No host nor list of topics specified for ' +
'listener n.{}'.format(i+1)) 'listener n.{}'.format(i + 1))
continue continue
client = mqtt.Client() client = mqtt.Client()
@ -160,15 +170,17 @@ class MqttBackend(Backend):
tls_version=listener.get('tls_version'), tls_version=listener.get('tls_version'),
ciphers=listener.get('tls_ciphers')) ciphers=listener.get('tls_ciphers'))
threading.Thread(target=listener_thread, kwargs = { threading.Thread(target=listener_thread, kwargs={
'client': client, 'host': host, 'port': port }).start() 'client': client, 'host': host, 'port': port}).start()
def run(self): def run(self):
# noinspection PyUnusedLocal
def on_connect(client, userdata, flags, rc): def on_connect(client, userdata, flags, rc):
client.subscribe(self.topic) client.subscribe(self.topic)
# noinspection PyUnusedLocal
def on_message(client, userdata, msg): def on_message(client, userdata, msg):
# noinspection PyShadowingNames
def response_thread(msg): def response_thread(msg):
set_thread_name('MQTTProcessor') set_thread_name('MQTTProcessor')
response = self.get_message_response(msg) response = self.get_message_response(msg)
@ -177,14 +189,19 @@ class MqttBackend(Backend):
response_topic = '{}/responses/{}'.format(self.topic, msg.id) response_topic = '{}/responses/{}'.format(self.topic, msg.id)
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))
self.send_message(response) self.send_message(response)
msg = msg.payload.decode('utf-8') msg = msg.payload.decode('utf-8')
try: msg = Message.build(json.loads(msg)) # noinspection PyBroadException
except: pass try:
if not msg: return msg = Message.build(json.loads(msg))
except:
pass
if not msg:
return
self.logger.info('Received message on the MQTT backend: {}'.format(msg)) self.logger.info('Received message on the MQTT backend: {}'.format(msg))
@ -211,12 +228,12 @@ class MqttBackend(Backend):
if self.tls_cafile: if self.tls_cafile:
self._client.tls_set(ca_certs=self.tls_cafile, certfile=self.tls_certfile, self._client.tls_set(ca_certs=self.tls_cafile, certfile=self.tls_certfile,
keyfile=self.tls_keyfile, tls_version=self.tls_version, keyfile=self.tls_keyfile, tls_version=self.tls_version,
ciphers=self.tls_ciphers) ciphers=self.tls_ciphers)
self._client.connect(self.host, self.port, 60) self._client.connect(self.host, self.port, 60)
self.logger.info('Initialized MQTT backend on host {}:{}, topic {}'. self.logger.info('Initialized MQTT backend on host {}:{}, topic {}'.
format(self.host, self.port, self.topic)) format(self.host, self.port, self.topic))
self._initialize_listeners(self.listeners_conf) self._initialize_listeners(self.listeners_conf)
self._client.loop_forever() self._client.loop_forever()
@ -232,10 +249,10 @@ class MqttBackend(Backend):
try: try:
listener.loop_stop() listener.loop_stop()
except Exception as e: except Exception as e:
# noinspection PyProtectedMember
self.logger.warning('Could not stop listener ' + self.logger.warning('Could not stop listener ' +
'{host}:{port}: {error}'.format( '{host}:{port}: {error}'.format(
host=listener._host, port=listener._port, host=listener._host, port=listener._port,
error=str(e))) error=str(e)))
# vim:sw=4:ts=4:et: # vim:sw=4:ts=4:et: