Merge branch 'master' of github.com:thingsboard/thingsboard-gateway

Author: imbeacon

thingsboard_gateway/connectors/opcua/opcua_connector.py

@@ -904,7 +904,8 @@ async def _load_devices_nodes(self):
                             UaStatusCodeErrors,
                             BadWaitingForInitialData):
                         if node.get('valid', True):
-                            self.__log.warning('Node not found (2); device: %s, key: %s, path: %s', device.name,
+                            self.__log.warning('Node not found (2); device: %s, key: %s, path: %s',
+                                               device.name,
                                                node['key'], node['path'])
                             await self.__unsubscribe_from_node(device, node)
                     except UaStatusCodeError as uae:
@@ -1135,7 +1136,7 @@ def on_attributes_update(self, content: Dict):
 
                     continue
                 self.__write_node_value(node_id, value, timeout=ON_ATTRIBUTE_UPDATE_DEFAULT_TIMEOUT)
-                self.__log.debug("Successfully proccesed attribute update for device %s with key %s", device.name)
+                self.__log.debug("Successfully proccesed attribute update for device %s with key %s", device.name, key)
 
         except Exception as e:
             self.__log.exception(e)
@@ -1156,7 +1157,7 @@ def __write_node_value(self, node_id: NodeId, value, timeout: float) -> bool:
                                                                    poll_interval=0.2)
             if not task_completed:
                 self.__log.error(
-                    "Failed to process request for %s, timeout has been reached",
+                    "Failed to process request for %s, timeout has been reached", 
                 )
                 result = {"error": f"Timeout has been reached during write {value}"}