From a0a9f2b6037714db1fb40e1d70bc1f399cf0e767 Mon Sep 17 00:00:00 2001 From: zbeacon Date: Thu, 20 Feb 2020 12:35:41 +0200 Subject: [PATCH] Improvements for statistic collecting --- .../gateway/tb_gateway_service.py | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/thingsboard_gateway/gateway/tb_gateway_service.py b/thingsboard_gateway/gateway/tb_gateway_service.py index 621a05f9..32d50026 100644 --- a/thingsboard_gateway/gateway/tb_gateway_service.py +++ b/thingsboard_gateway/gateway/tb_gateway_service.py @@ -440,19 +440,18 @@ class TBGatewayService: summary_messages = {"eventsProduced": 0, "eventsSent": 0} telemetry = {} for connector in self.available_connectors: - if self.available_connectors[connector].is_connected(): - connector_camel_case = connector[0].lower() + connector[1:].replace(' ', '') - telemetry[(connector_camel_case + ' EventsProduced').replace(' ', '')] = \ - self.available_connectors[connector].statistics['MessagesReceived'] - self.available_connectors[connector].statistics['MessagesReceived'] = 0 - telemetry[(connector_camel_case + ' EventsSent').replace(' ', '')] = \ - self.available_connectors[connector].statistics['MessagesSent'] - self.available_connectors[connector].statistics['MessagesSent'] = 0 - summary_messages['eventsProduced'] += telemetry[ - str(connector_camel_case + ' EventsProduced').replace(' ', '')] - summary_messages['eventsSent'] += telemetry[ - str(connector_camel_case + ' EventsSent').replace(' ', '')] - summary_messages.update(**telemetry) + connector_camel_case = connector[0].lower() + connector[1:].replace(' ', '') + telemetry[(connector_camel_case + ' EventsProduced').replace(' ', '')] = \ + self.available_connectors[connector].statistics['MessagesReceived'] + self.available_connectors[connector].statistics['MessagesReceived'] = 0 + telemetry[(connector_camel_case + ' EventsSent').replace(' ', '')] = \ + self.available_connectors[connector].statistics['MessagesSent'] + self.available_connectors[connector].statistics['MessagesSent'] = 0 + summary_messages['eventsProduced'] += telemetry[ + str(connector_camel_case + ' EventsProduced').replace(' ', '')] + summary_messages['eventsSent'] += telemetry[ + str(connector_camel_case + ' EventsSent').replace(' ', '')] + summary_messages.update(**telemetry) return summary_messages def add_device(self, device_name, content, wait_for_publish=False, device_type=None):