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

The zigbee2mqtt backend should use a suffix for the default client_id to prevent clashes with the default client_id from the MQTT backend [see #175]

Browse source
This commit is contained in:
Fabio Manganiello 2021-03-11 19:24:13 +01:00
parent 3d6af00ee6
commit 40834f7ce5
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
platypush/backend/zigbee/mqtt.py
View file

@ -63,7 +63,7 @@ class ZigbeeMqttBackend(MqttBackend):
tls_cafile: Optional[str] = None, tls_certfile: Optional[str] = None, tls_cafile: Optional[str] = None, tls_certfile: Optional[str] = None,
tls_keyfile: Optional[str] = None, tls_version: Optional[str] = None, tls_keyfile: Optional[str] = None, tls_version: Optional[str] = None,
tls_ciphers: Optional[str] = None, username: Optional[str] = None, tls_ciphers: Optional[str] = None, username: Optional[str] = None,
password: Optional[str] = None, *args, **kwargs): password: Optional[str] = None, client_id: Optional[str] = None, *args, **kwargs):
""" """
:param host: MQTT broker host (default: host configured on the ``zigbee.mqtt`` plugin). :param host: MQTT broker host (default: host configured on the ``zigbee.mqtt`` plugin).
:param port: MQTT broker port (default: 1883). :param port: MQTT broker port (default: 1883).
@ -80,6 +80,8 @@ class ZigbeeMqttBackend(MqttBackend):
required, specify it here (default: None) required, specify it here (default: None)
:param username: Specify it if the MQTT server requires authentication (default: None) :param username: Specify it if the MQTT server requires authentication (default: None)
:param password: Specify it if the MQTT server requires authentication (default: None) :param password: Specify it if the MQTT server requires authentication (default: None)
:param client_id: MQTT client ID (default: ``<device_id>-zigbee-mqtt``, to prevent clashes with the
:class:`platypush.backend.mqtt.MqttBackend` ``client_id``.
""" """
plugin = get_plugin('zigbee.mqtt') plugin = get_plugin('zigbee.mqtt')
@ -107,7 +109,9 @@ class ZigbeeMqttBackend(MqttBackend):
], ],
}] }]
super().__init__(subscribe_default_topic=False, listeners=listeners, *args, **kwargs) super().__init__(subscribe_default_topic=False, listeners=listeners, client_id=client_id, *args, **kwargs)
if not client_id:
self.client_id += '-zigbee-mqtt'
def _process_state_message(self, client, msg): def _process_state_message(self, client, msg):
if msg == self._last_state: if msg == self._last_state: