Client disconnect bug

sonerb · web-flow · commit ef2e9bb236c5 · 2018-11-15T19:38:15.000+03:00
- shutdown and close connection from client when disconnect
- added 0.1 secs. delay before sending userlist, after connection success.
diff --git a/client.py b/client.py
@@ -92,10 +92,12 @@ def __init__(self, *args, **kwargs):
 
     @property
     def enc_pass(self):
+        """ return enc_pass value """
         return self._enc_pass
 
     @enc_pass.setter
     def enc_pass(self, x):
+        """ set enc_pass value """
         self._enc_pass = x
         self.kripton = Crypton(self._enc_pass)
 
@@ -106,26 +108,35 @@ def json_to_str(self, j_data):
     def connect(self):
         """ start connection method """
         if not self.is_connected:
-            self.sck = socket.socket()
-            LOGGER.info('Connecting...')
             try:
+                self.sck = socket.socket()
+                self.sck.settimeout(5)
+                LOGGER.info('Connecting...')
                 self.sck.connect(self.host_port)
-                self.is_connected = True
             except ConnectionRefusedError:
                 LOGGER.error('Connection Refused!')
-                self.is_connected = False
+                error_message = "Connection Refused!"
             except ConnectionAbortedError:
                 LOGGER.error('Connection Aborted!')
-                self.is_connected = False
+                error_message = "Connection Aborted!"
             except ConnectionResetError:
                 LOGGER.error('Connection Reset!')
-                self.is_connected = False
+                error_message = "Connection Reset!"
+            except socket.timeout:
+                LOGGER.error('Socket Timeout Error')
+                error_message = "Socket Timeout Error!"
+            except TimeoutError:
+                LOGGER.error('Timeout Error')
+                error_message = "Timeout Error!"
+            else:
+                self.sck.settimeout(None)
+                self.is_connected = True
         else:
             LOGGER.info('Already Connected')
 
         if not self.is_connected:
             self.sck.close()
-            self.signals.signal_show_dialog_box.emit('Hata', 'Sunucuya erişilemedi!', 'c')
+            self.signals.signal_show_dialog_box.emit('Error', error_message, 'c')
         else:
             self.status = True
 
@@ -182,6 +193,8 @@ def on_disconnect(self, user_data):
             self.signals.signal_on_message.emit(self.create_message(username, message, date_time))
             self.signals.signal_clear_user_list.emit()
 
+        self.sck.shutdown(socket.SHUT_WR)
+        self.sck.close()
         LOGGER.info('Disconnect oldum')
         return True
 
@@ -256,6 +269,7 @@ def listen(self):
                     try:
                         j_data = json.loads(data)
                     except json.JSONDecodeError:
+                        LOGGER.error('json data : %s', data)
                         LOGGER.error('JSON Error')
                         continue
 
diff --git a/server.py b/server.py
@@ -104,7 +104,8 @@ def on_connect(self, id, user_socket, user_data):
             else:
                 data = {'action': 'connect', 'username': 'server', 'message': 'Hoşgeldiniz, {0}'.format(username), 'date_time': self.get_date_time(), 'status': True}
                 user_socket['c'].send(self.json_to_str(data).encode('utf-8'))
-            
+        
+        time.sleep(0.1)
         self.send_user_list()
 
     def on_disconnect(self, id, user_socket, user_data):
@@ -119,7 +120,11 @@ def on_disconnect(self, id, user_socket, user_data):
                 data = {'action': 'disconnect', 'username': 'server', 'message': 'Güle güle, {0}'.format(username), 'date_time': self.get_date_time(), 'status': True}
                 user_socket['c'].send(self.json_to_str(data).encode('utf-8'))
 
+        # self.connections[id]['c'].shutdown(socket.SHUT_WR)
+        # self.connections[id]['c'].close()
         del self.connections[id]
+    
+        LOGGER.info('%s kullanıcısı silindi', id)
 
         self.send_user_list()
 
@@ -176,6 +181,7 @@ def listen(self, id):
                     try:
                         j_data = json.loads(data)
                     except json.JSONDecodeError:
+                        LOGGER.error('json data : %s', data)
                         LOGGER.error('JSON Error')
                         continue
 
