Adjusted limitations processing on getting service configuration

Author: imbeacon

tb_device_mqtt.py

@@ -661,12 +661,10 @@ def send_rpc_call(self, method, params, callback):
             self.__device_client_rpc_dict.update({self.__device_client_rpc_number: callback})
             rpc_request_id = self.__device_client_rpc_number
         payload = {"method": method, "params": params}
-        self._publish_data(payload,
-                           RPC_REQUEST_TOPIC + str(rpc_request_id),
-                           self.quality_of_service)
+        self._publish_data(payload, RPC_REQUEST_TOPIC + str(rpc_request_id), self.quality_of_service)
 
     def request_service_configuration(self, callback):
-        self.send_rpc_call("getSessionLimits", {}, callback)
+        self.send_rpc_call("getSessionLimits", {"timeout": 5000}, callback)
 
     def on_service_configuration(self, _, response, *args, **kwargs):
         if "error" in response:
@@ -688,7 +686,10 @@ def on_service_configuration(self, _, response, *args, **kwargs):
             if rate_limits_config.get('telemetryDataPoints'):
                 self.__telemetry_dp_rate_limit.set_limit(rate_limits_config.get('telemetryDataPoints'), percentage=80)
         if service_config.get('maxInflightMessages'):
-            self.max_inflight_messages_set(5)#int(service_config.get('maxInflightMessages')))
+            max_inflight_messages = min(self._messages_rate_limit.get_minimal_limit(),
+                                        self.__telemetry_rate_limit.get_minimal_limit(),
+                                        service_config.get('maxInflightMessages', 100))
+            self.max_inflight_messages_set(max_inflight_messages)
         if service_config.get('maxPayloadSize'):
             self.max_payload_size = int(service_config.get('maxPayloadSize'))
         log.info("Service configuration was successfully retrieved and applied.")

tb_gateway_mqtt.py

@@ -346,11 +346,4 @@ def __on_service_configuration(self, _, response, *args, **kwargs):
             # change rate limit for already connected devices
             self._change_devices_rate_limit('telemetry_dp_rate_limit',
                                             device_rate_limit_config.get('telemetryDataPoints'))
-
-        if service_config.get('maxInflightMessages'):
-            self.max_inflight_messages_set(int(service_config.get('maxInflightMessages')))
-        if service_config.get('maxPayloadSize'):
-            self.max_payload_size = int(service_config.get('maxPayloadSize'))
-        if service_config.get('payloadType'):
-            pass
         self.rate_limits_received = True