esp32/frozen: updated MQTTMsgHandler.py

esp32/frozen/Common/MQTTMsgHandler.py

@@ -79,6 +79,7 @@ def createSocketConnection(self):
                 self._sock = None
 
             self._sock = socket.socket()
+            self._sock.settimeout(30)
             if self._cafile:
                 self._sock = ssl.wrap_socket(
                     self._sock,
@@ -153,7 +154,11 @@ def priority_send(self, packet):
         return msg_sent
 
     def _receive_packet(self):
-        if not self._poll.poll(self._receive_timeout):
+        try:
+            if not self._poll.poll(self._receive_timeout):
+                return False
+        except Exception as err:
+            print("Poll error: {0}".format(err))
             return False
 
         # Read message type
@@ -257,14 +262,15 @@ def _io_thread_func(self):
             self._verify_connection_state()
 
             self._out_packet_mutex.acquire()
-            if self._out_packet_mutex.locked() and len(self._output_queue) > 0:
-                packet=self._output_queue[0]
-                if self._send_packet(packet):
-                    self._output_queue.pop(0)
+            if self._ping_failures == 0:
+                if self._out_packet_mutex.locked() and len(self._output_queue) > 0:
+                    packet=self._output_queue[0]
+                    if self._send_packet(packet):
+                        self._output_queue.pop(0)
             self._out_packet_mutex.release()
 
             self._receive_packet()
             self._callShadowCallback()
 
             if len(self._output_queue) >= self._draining_cutoff:
-                time.sleep(self._draining_interval)
+                time.sleep(self._draining_interval)