Merge branch 'thingsboard:master' into modificationConverter

thingsboard · Oct 28, 2024 · 093c77c · 093c77c
2 parents 302684a + acb75f0
commit 093c77c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/thingsboard_gateway/connectors/mqtt/mqtt_connector.py b/thingsboard_gateway/connectors/mqtt/mqtt_connector.py
@@ -197,12 +197,13 @@ def __init__(self, gateway, config, connector_type):
         self._mqtt_version = self.__broker.get('version', 5)
         try:
             if self._mqtt_version != 5:
-                self._client = Client(client_id, clean_session=self._cleanSession, protocol=MQTT_VERSIONS[self._mqtt_version])
+                self._client = Client(client_id=client_id, clean_session=self._cleanSession,
+                                      protocol=MQTT_VERSIONS[self._mqtt_version])
             else:
-                self._client = Client(client_id, protocol=MQTT_VERSIONS[self._mqtt_version])
+                self._client = Client(client_id=client_id, protocol=MQTT_VERSIONS[self._mqtt_version])
         except KeyError:
             self.__log.error('Unknown MQTT version. Starting up on version 5...')
-            self._client = Client(client_id, protocol=MQTTv5)
+            self._client = Client(client_id=client_id, protocol=MQTTv5)
             self._mqtt_version = 5
 
         self.name = config.get("name", self.__broker.get(

diff --git a/thingsboard_gateway/gateway/tb_gateway_service.py b/thingsboard_gateway/gateway/tb_gateway_service.py
@@ -708,6 +708,9 @@ def __process_deleted_gateway_devices(self, deleted_device_name: str):
         if deleted_device_name in self.__saved_devices:
             del self.__saved_devices[deleted_device_name]
             log.debug("Device %s - was removed from __saved_devices", deleted_device_name)
+        if deleted_device_name in self.__added_devices:
+            del self.__added_devices[deleted_device_name]
+            log.debug("Device %s - was removed from __added_devices", deleted_device_name)
         if hasattr(self, "__duplicate_detector"):
             self.__duplicate_detector.delete_device(deleted_device_name)
         self.__save_persistent_devices()
@@ -1770,8 +1773,10 @@ def del_device(self, device_name):
                 self.tb_client.client.gw_disconnect_device(device_name)
             except Exception as e:
                 log.exception("Error on disconnecting device %s", device_name, exc_info=e)
+
             self.__connected_devices.pop(device_name, None)
             self.__saved_devices.pop(device_name, None)
+            self.__added_devices.pop(device_name, None)
             self.__save_persistent_devices()
 
     def get_devices(self, connector_id: str = None):