@@ -61,14 +61,14 @@ def server(serverPort, logArea, terminateFlag):
61
61
pendingData = bytesReceived .pop (sock , b'' ).decode ("utf8" )
62
62
63
63
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 ])
65
65
66
66
else :
67
- logMessage (f"Disconnection: Client { address } \n " , logArea , logFiles [sock . fileno () ])
67
+ logMessage (f"Disconnection: Client { address } \n " , logArea , logFiles [sock ])
68
68
69
69
pollObject .unregister (fd )
70
- logFiles [sock . fileno () ].close ()
71
- del logFiles [sock . fileno () ]
70
+ logFiles [sock ].close ()
71
+ del logFiles [sock ]
72
72
del clientSockets [fd ]
73
73
74
74
elif sock is serverSocket :
@@ -79,10 +79,10 @@ def server(serverPort, logArea, terminateFlag):
79
79
sock .setblocking (False )
80
80
clientSockets [sock .fileno ()] = sock
81
81
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" )
83
83
pollObject .register (sock , select .POLLIN )
84
84
85
- logMessage (f"New Connection from { address } \n " , logArea , logFiles [sock . fileno () ])
85
+ logMessage (f"New Connection from { address } \n " , logArea , logFiles [sock ])
86
86
87
87
elif event & select .POLLIN :
88
88
@@ -96,7 +96,7 @@ def server(serverPort, logArea, terminateFlag):
96
96
totalData = bytesReceived .pop (sock , b'' ) + nextData
97
97
98
98
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 ])
100
100
101
101
else :
102
102
bytesReceived [sock ] = totalData
0 commit comments