Fixed setting rate limits (no limit) via service configuration callback

Author: samson0v

tb_device_mqtt.py

@@ -701,14 +701,20 @@ def on_service_configuration(self, _, response, *args, **kwargs):
         if service_config.get("rateLimit"):
             rate_limits_config = service_config.get("rateLimit")
 
-            messages_rate_limit_config = rate_limits_config['messages'] if rate_limits_config['messages'] else '0:0,'
-            self._messages_rate_limit.set_limit(messages_rate_limit_config)
+            if rate_limits_config.get('messages'):
+                self._messages_rate_limit.set_limit(rate_limits_config.get('messages'))
+            else:
+                self._messages_rate_limit.set_limit('0:0,')
 
-            telemetry_messages_rate_limit_config = rate_limits_config['telemetryMessages'] if rate_limits_config['telemetryMessages'] else '0:0,'
-            self._telemetry_rate_limit.set_limit(telemetry_messages_rate_limit_config)
+            if rate_limits_config.get('telemetryMessages'):
+                self._telemetry_rate_limit.set_limit(rate_limits_config.get('telemetryMessages'))
+            else:
+                self._telemetry_rate_limit.set_limit('0:0,')
 
-            telemetry_dp_rate_limit_config = rate_limits_config['telemetryDataPoints'] if rate_limits_config['telemetryDataPoints'] else '0:0,'
-            self._telemetry_dp_rate_limit.set_limit(telemetry_dp_rate_limit_config)
+            if rate_limits_config.get('telemetryDataPoints'):
+                self._telemetry_dp_rate_limit.set_limit(rate_limits_config.get('telemetryDataPoints'))
+            else:
+                self._telemetry_dp_rate_limit.set_limit('0:0,')
 
         if service_config.get('maxInflightMessages'):
             use_messages_rate_limit_factor = self._messages_rate_limit.has_limit()

tb_gateway_mqtt.py

@@ -301,13 +301,22 @@ def __on_service_configuration(self, _, response, *args, **kwargs):
         gateway_devices_rate_limit_config = service_config.pop('gatewayRateLimits', {})
         gateway_device_itself_rate_limit_config = service_config.pop('rateLimits', {})
 
-        messages_rate_limit_config = gateway_devices_rate_limit_config['messages'] if gateway_devices_rate_limit_config['messages'] else '0:0,'
-        self._devices_connected_through_gateway_messages_rate_limit.set_limit(messages_rate_limit_config)
+        if gateway_devices_rate_limit_config.get("messages"):
+            self._devices_connected_through_gateway_messages_rate_limit.set_limit(
+                gateway_devices_rate_limit_config.get("messages"))
+        else:
+            self._devices_connected_through_gateway_messages_rate_limit.set_limit('0:0,')
 
-        telemetry_messages_rate_limit_config = gateway_devices_rate_limit_config['telemetryMessages'] if gateway_devices_rate_limit_config['telemetryMessages'] else '0:0,'
-        self._devices_connected_through_gateway_telemetry_messages_rate_limit.set_limit(telemetry_messages_rate_limit_config)
+        if gateway_devices_rate_limit_config.get('telemetryMessages'):
+            self._devices_connected_through_gateway_telemetry_messages_rate_limit.set_limit(
+                gateway_devices_rate_limit_config.get('telemetryMessages'))
+        else:
+            self._devices_connected_through_gateway_telemetry_messages_rate_limit.set_limit('0:0,')
 
-        telemetry_dp_rate_limit_config = gateway_devices_rate_limit_config['telemetryDataPoints'] if gateway_devices_rate_limit_config['telemetryDataPoints'] else '0:0,'
-        self._devices_connected_through_gateway_telemetry_datapoints_rate_limit.set_limit(telemetry_dp_rate_limit_config)
+        if gateway_devices_rate_limit_config.get('telemetryDataPoints'):
+            self._devices_connected_through_gateway_telemetry_datapoints_rate_limit.set_limit(
+                gateway_devices_rate_limit_config.get('telemetryDataPoints'))
+        else:
+            self._devices_connected_through_gateway_telemetry_datapoints_rate_limit.set_limit('0:0,')
 
         super().on_service_configuration(_, {'rateLimit': gateway_device_itself_rate_limit_config, **service_config}, *args, **kwargs)