Skip to content

Commit 0cc8952

Browse files
committed
=)
1 parent 8bdbe03 commit 0cc8952

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

zavatskiy/client01.py

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import time
12
import socket
23

34
from work.helpers import make_message, parse_message
@@ -30,7 +31,10 @@ def close(self):
3031
while True:
3132
data = raw_input('pingd> ')
3233
client.send('pingd', data)
34+
3335
ans = client.recive()
36+
if not ans[0]:
37+
client.close()
3438
if ans[0] in ['ackquit', 'ackfinish']:
3539
break
3640

zavatskiy/server01.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,19 @@ def handle_request(self, conn, addr):
5353
def serve(self):
5454
""" Run server """
5555
while not self.__shutdown:
56-
conn, addr = self.socket.accept()
57-
self.new_stream(conn, addr)
56+
try:
57+
conn, addr = self.socket.accept()
58+
self.new_stream(conn, addr)
59+
except KeyboardInterrupt:
60+
self.__shutdown = True
61+
5862
self.shutdown()
5963

6064
def shutdown(self):
6165
""" Shutdown server """
6266
for thread in self.threads:
6367
thread.join()
68+
6469
self.socket.close()
6570

6671

0 commit comments

Comments
 (0)