Merge pull request #78 from samson0v/master

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

Author: imbeacon

tb_device_mqtt.py

@@ -702,11 +702,19 @@ def on_service_configuration(self, _, response, *args, **kwargs):
             rate_limits_config = service_config.get("rateLimit")
 
             if rate_limits_config.get('messages'):
-                self._messages_rate_limit.set_limit(rate_limits_config.get('messages'), percentage=80)
+                self._messages_rate_limit.set_limit(rate_limits_config.get('messages'))
+            else:
+                self._messages_rate_limit.set_limit('0:0,')
+
             if rate_limits_config.get('telemetryMessages'):
-                self._telemetry_rate_limit.set_limit(rate_limits_config.get('telemetryMessages'), percentage=80)
+                self._telemetry_rate_limit.set_limit(rate_limits_config.get('telemetryMessages'))
+            else:
+                self._telemetry_rate_limit.set_limit('0:0,')
+
             if rate_limits_config.get('telemetryDataPoints'):
-                self._telemetry_dp_rate_limit.set_limit(rate_limits_config.get('telemetryDataPoints'), percentage=80)
+                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

@@ -302,10 +302,21 @@ def __on_service_configuration(self, _, response, *args, **kwargs):
         gateway_device_itself_rate_limit_config = service_config.pop('rateLimits', {})
 
         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"))
+            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,')
+
         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'))
+            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,')
+
         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'))
+            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)