BiztProtoBois/server
3
0
Fork 0
Code Pull Requests Releases Activity

remove more redundant try
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Torma Kristóf
2021-04-26 23:22:45 +02:00
parent 09c376debf
commit 00d4542404
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/netwrapper.py
View File

@@ -111,7 +111,6 @@ class NetWrapper:
self.cipherkey = (hasher.hexdigest()[:32]).encode('UTF-8') self.cipherkey = (hasher.hexdigest()[:32]).encode('UTF-8')
def login(self) -> bool: def login(self) -> bool:
try:
status, msg = self.network.receive_msg(blocking=True) status, msg = self.network.receive_msg(blocking=True)
if not status: if not status:
raise Exception('Network error during connection.') raise Exception('Network error during connection.')
@@ -129,9 +128,6 @@ class NetWrapper:
message = "ERROR".encode('UTF-8') message = "ERROR".encode('UTF-8')
self.sendTypedMessage(message, "AUT") self.sendTypedMessage(message, "AUT")
return linsuccess return linsuccess
except Exception:
print("Login failed")
return False
def initClientConnection(self, msg: bytes) -> bytes: def initClientConnection(self, msg: bytes) -> bytes:
print('A client is trying to connect') print('A client is trying to connect')

1
server/server.py
View File

@@ -35,7 +35,6 @@ class Server:
self.networkInstance.sendMessage("OK".encode('UTF-8')) self.networkInstance.sendMessage("OK".encode('UTF-8'))
return None return None
elif command == "LINERROR": elif command == "LINERROR":
self.networkInstance.sendMessage("ERROR".encode('UTF-8'))
return None return None
elif command == "ERROR": elif command == "ERROR":
self.networkInstance.sendMessage("ERROR".encode('UTF-8')) self.networkInstance.sendMessage("ERROR".encode('UTF-8'))