|
1 | 1 | from modules.commands import handle_input |
| 2 | +from socket import error as SocketError |
| 3 | +import errno |
2 | 4 | import socket |
3 | 5 | import select |
4 | 6 |
|
@@ -33,19 +35,24 @@ def start(self): |
33 | 35 | self.inputs.append(client) |
34 | 36 | client.send(self.hello.encode()) |
35 | 37 | else: |
36 | | - data = sock.recv(self.BUFFER_SIZE) |
37 | | - if data: |
38 | | - command = data.decode("UTF-8") |
39 | | - success, output = handle_input(command, self.worker, self) |
40 | | - sock.send(output.encode()+b"\n#> ") |
41 | | - else: |
42 | | - if sock in self.outputs: |
43 | | - self.outputs.remove(sock) |
44 | | - if sock in self.inputs: |
45 | | - self.inputs.remove(sock) |
46 | | - if sock not in self.outputs: |
47 | | - self.outputs.append(sock) |
48 | | - |
| 38 | + try: |
| 39 | + data = sock.recv(self.BUFFER_SIZE) |
| 40 | + if data: |
| 41 | + command = data.decode("UTF-8") |
| 42 | + success, output = handle_input(command, self.worker, self) |
| 43 | + sock.send(output.encode()+b"\n#> ") |
| 44 | + else: |
| 45 | + if sock in self.outputs: |
| 46 | + self.outputs.remove(sock) |
| 47 | + if sock in self.inputs: |
| 48 | + self.inputs.remove(sock) |
| 49 | + if sock not in self.outputs: |
| 50 | + self.outputs.append(sock) |
| 51 | + except SocketError as e: |
| 52 | + if e.errno != errno.ECONNRESET: |
| 53 | + raise |
| 54 | + self.inputs.remove(sock) |
| 55 | + |
49 | 56 | def stop(self): |
50 | 57 | print("Exiting...") |
51 | 58 | if self.socket is not None: |
|
0 commit comments