BOSWatch/BW3-Core
1
0
Fork 0
mirror of https://github.com/BOSWatch/BW3-Core.git synced 2026-04-04 22:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

simplify server/client exception handling

Browse source
This commit is contained in:
Bastian Schroll 2019-10-20 18:55:02 +02:00
parent ae36cf8045
commit 056e7857e5
2 changed files with 25 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

10
boswatch/network/server.py
View file

@ -69,8 +69,9 @@ class _ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
self.request.sendall(bytes(header + data, "utf-8"))
self.request.close()
except (ConnectionResetError, ConnectionAbortedError): # pragma: no cover
logging.debug("%s connection closed", req_name)
except socket.error as e:
logging.error(e)
return False
finally:
del self.server.clientsConnected[threading.current_thread().name]
logging.info("Client disconnected: %s", self.client_address[0])
@ -129,8 +130,9 @@ class TCPServer:
self._server_thread.start()
logging.debug("TCPServer started in Thread: %s", self._server_thread.name)
return True
except OSError:
logging.exception("Socket Error")
except socket.error as e:
logging.error(e)
return False
else:
logging.warning("server always started")