X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=stratum.py;h=8a25065120cbd9b428d1b082e21e9e5c93692b7f;hb=947482872efcf6c7a559674e3e50f0d492673bad;hp=74e5866dac0a8976029298c06bb1cb059b21ff77;hpb=651a0fcb8248634bd4e28ecc72e7d592eea87d2f;p=electrum-server.git

diff --git a/stratum.py b/stratum.py
index 74e5866..8a25065 100644
--- a/stratum.py
+++ b/stratum.py
@@ -148,15 +148,15 @@ class TcpClientRequestor(threading.Thread):
                 continue
 
             try:
-                message_id = command.get('id')
-                method = command.get('method')
-                params = command.get('params')
-            except:
+                # Try to load vital fields, and return an error if
+                # unsuccessful.
+                message_id = command['id']
+                method = command['method']
+            except KeyError:
+                # This should return an error JSON in response.
                 print "syntax error", repr(command), self.session.address[0]
-                continue
-
-            self.session.push_request((message_id, method, params))
-            print message_id, method, params
+            else:
+                self.session.push_request(command)
 
 class TcpServer(threading.Thread):