PR feedback

Author: Jim Bennett

adafruit_azureiot/device_registration.py

@@ -61,7 +61,6 @@ def __init__(
         self._key = key
         self._logger = logger if logger is not None else logging.getLogger("log")
 
-        self._mqtt_connected = False
         self._mqtt = None
         self._auth_response_received = False
         self._operation_id = None
@@ -76,8 +75,7 @@ def _on_connect(self, client, userdata, _, rc) -> None:
         self._logger.info(
             f"- device_registration :: _on_connect :: rc = {str(rc)}, userdata = {str(userdata)}"
         )
-        if rc == 0:
-            self._mqtt_connected = True
+
         self._auth_response_received = True
 
     # pylint: disable=W0613
@@ -109,10 +107,10 @@ def _connect_to_mqtt(self) -> None:
             self._mqtt.loop()
 
         self._logger.info(
-            f" - device_registration :: connect :: on_connect must be fired. Connected ? {str(self._mqtt_connected)}"
+            f" - device_registration :: connect :: on_connect must be fired. Connected ? {str(self._mqtt.is_connected())}"
         )
 
-        if not self._mqtt_connected:
+        if not self._mqtt.is_connected():
             raise DeviceRegistrationError("Cannot connect to MQTT")
 
     def _start_registration(self) -> None:

adafruit_azureiot/iot_mqtt.py

@@ -146,8 +146,7 @@ def _on_connect(self, client, userdata, _, rc) -> None:
             + ", userdata = "
             + str(userdata)
         )
-        if rc == 0:
-            self._mqtt_connected = True
+        
         self._auth_response_received = True
         self._callback.connection_status_change(True)
 
@@ -159,9 +158,6 @@ def _on_disconnect(self, client, userdata, rc) -> None:
             self._logger.error("on(disconnect) : Not authorized")
             self.disconnect()
 
-        if rc == 1:
-            self._mqtt_connected = False
-
         if rc != 5:
             self._callback.connection_status_change(False)
 
@@ -340,7 +336,6 @@ def __init__(
         self._callback = callback
         self._socket = socket
         self._iface = iface
-        self._mqtt_connected = False
         self._auth_response_received = False
         self._mqtts = None
         self._device_id = device_id
@@ -397,7 +392,6 @@ def connect(self) -> bool:
         if not self.is_connected():
             return False
 
-        self._mqtt_connected = True
         self._auth_response_received = True
 
         self._subscribe_to_core_topics()
@@ -424,7 +418,6 @@ def disconnect(self) -> None:
             return
 
         self._logger.info("- iot_mqtt :: disconnect :: ")
-        self._mqtt_connected = False
         self._mqtts.disconnect()
 
     def reconnect(self) -> None:
@@ -438,7 +431,7 @@ def is_connected(self) -> bool:
         :returns: True if there is an open connection, False if not
         :rtype: bool
         """
-        return self._mqtt_connected
+        return self._mqtts.is_connected()
 
     def loop(self) -> None:
         """Listens for MQTT messages"""