From d279585f870a5a931e9b5610f0c4982e0948d430 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Thu, 15 Mar 2012 00:16:55 +0300 Subject: [PATCH] quit command for telnet --- server.py | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/server.py b/server.py index 42b6b9f..cf0e291 100755 --- a/server.py +++ b/server.py @@ -704,9 +704,17 @@ def tcp_client_thread(ipaddr,conn): if s ==-1: break else: - c = msg[0:s] + c = msg[0:s].strip() msg = msg[s+1:] - c = json.loads(c) + if c == 'quit': + conn.close() + close_session(session_id) + return + try: + c = json.loads(c) + except: + print "json error", repr(c) + continue try: cmd = c['method'] data = c['params'] @@ -718,6 +726,7 @@ def tcp_client_thread(ipaddr,conn): input_queue.put((session_id, cmd, data)) + # read commands from the input queue. perform requests, etc. this should be called from the main thread. def process_input_queue(): while not stopping: -- 1.7.1