Merge branch 'master' of https://github.com/jantuomi/chatserver-homework

1 files changed, 15 insertions, 3 deletions

diff --git a/server.py b/server.py
index b7d5c28..d08be9d 100755
--- a/server.py
+++ b/server.py
@@ -2,16 +2,28 @@
 
 import socket
 import threading
+import signal
+import sys
 from functools import partial
 from datetime import datetime
 
 HOST = "0.0.0.0"
 PORT = 5000
 DEBUG = True
+running = True
+
 def debug(string):
     if (DEBUG):
         print("{} DEBUG: {}".format(datetime.now(), string))
 
+def signal_handler(signal, frame):
+    print("Closing sockets and shutting down...")
+    global running
+    running = False
+    sys.exit(0)
+
+signal.signal(signal.SIGINT, signal_handler)
+
 def parse_message(text):
     rows = text.split('\n')
     if (len(rows) < 3):
@@ -42,7 +54,7 @@ def do_command(command, username, body, bc):
     elif command == "DISCONNECT":
         bc("User {} has disconnected".format(username), username)
     elif command == "MESSAGE":
-        bc("{}: {}".format(username, body), username)
+        bc("{}".format(body), username)
     elif command == "KEEPALIVE":
         pass
     else:
@@ -52,7 +64,7 @@ def keep_connection(conn, addr, connections):
     debug("Connection from: {}".format(addr))
 
     broadcast_fun = partial(broadcast, recipients=connections)
-    while True:
+    while running:
         data = conn.recv(1024).decode()
 
         if not data:
@@ -77,9 +89,9 @@ def main():
     connections = []
     threads = []
     sock.listen(1)
-    running = True
 
     print("Chat server running on {}:{}".format(HOST, PORT))
+    print("Press CTRL-C to quit")
 
     while running:
         conn, addr = sock.accept()