Skip to content

Commit f242f42

Browse files
server: use socket object for logFiles dictionary instead of socket.fileno()
1 parent 27c524c commit f242f42

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

server.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ def server(serverPort, logArea, terminateFlag):
6161
pendingData = bytesReceived.pop(sock, b'').decode("utf8")
6262

6363
if pendingData:
64-
logMessage(f"ABNORMAL DISCONNECTION: Client {address} with pending data: {pendingData}\n", logArea, logFiles[sock.fileno()])
64+
logMessage(f"ABNORMAL DISCONNECTION: Client {address} with pending data: {pendingData}\n", logArea, logFiles[sock])
6565

6666
else:
67-
logMessage(f"Disconnection: Client {address}\n", logArea, logFiles[sock.fileno()])
67+
logMessage(f"Disconnection: Client {address}\n", logArea, logFiles[sock])
6868

6969
pollObject.unregister(fd)
70-
logFiles[sock.fileno()].close()
71-
del logFiles[sock.fileno()]
70+
logFiles[sock].close()
71+
del logFiles[sock]
7272
del clientSockets[fd]
7373

7474
elif sock is serverSocket:
@@ -79,10 +79,10 @@ def server(serverPort, logArea, terminateFlag):
7979
sock.setblocking(False)
8080
clientSockets[sock.fileno()] = sock
8181
addresses[sock] = address
82-
logFiles[sock.fileno()] = open(f"server_logs/{sock.getpeername()[0]}.txt", "w")
82+
logFiles[sock] = open(f"server_logs/{sock.getpeername()[0]}.txt", "w")
8383
pollObject.register(sock, select.POLLIN)
8484

85-
logMessage(f"New Connection from {address}\n", logArea, logFiles[sock.fileno()])
85+
logMessage(f"New Connection from {address}\n", logArea, logFiles[sock])
8686

8787
elif event & select.POLLIN:
8888

@@ -96,7 +96,7 @@ def server(serverPort, logArea, terminateFlag):
9696
totalData = bytesReceived.pop(sock, b'') + nextData
9797

9898
if(totalData.endswith(b'~')):
99-
logMessage(f"{addresses[sock][0]}: {totalData.decode('utf8')[:-1]}", logArea, logFiles[sock.fileno()])
99+
logMessage(f"{addresses[sock][0]}: {totalData.decode('utf8')[:-1]}", logArea, logFiles[sock])
100100

101101
else:
102102
bytesReceived[sock] = totalData

0 commit comments

Comments
 (0)