electrum

commit 6f5180ded00af59b1ece9fa6b9fdeabd280d016e
parent c672b7952351bf786d86d72b03a18b57cd3b7649
Author: ThomasV <thomasv@gitorious>
Date:   Thu, 15 Mar 2012 00:16:55 +0300

quit command for telnet

Diffstat:
M
server/server.py
 | 
13
+++++++++++--

1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/server/server.py b/server/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: