From: Forrest Voight <forrest@forre.st>
Date: Fri, 16 Mar 2012 01:24:05 +0000 (-0400)
Subject: cleaned up error handling in jsonrpc and removed notification support
X-Git-Tag: 0.10.0~40
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=91cfd4e49d74e84e40ce995a360d992930979ce6;p=p2pool.git

cleaned up error handling in jsonrpc and removed notification support
---

diff --git a/p2pool/util/jsonrpc.py b/p2pool/util/jsonrpc.py
index 9ce0082..b833db3 100644
--- a/p2pool/util/jsonrpc.py
+++ b/p2pool/util/jsonrpc.py
@@ -72,8 +72,6 @@ class Server(deferred_resource.DeferredResource):
     
     @defer.inlineCallbacks
     def render_POST(self, request):
-        # missing batching, 1.0 notifications
-        
         id_ = None
         
         try:
@@ -85,15 +83,12 @@ class Server(deferred_resource.DeferredResource):
                 except Exception:
                     raise Error(-32700, u'Parse error')
                 
-                try:
-                    id_ = req.get('id', None)
-                    method = req['method']
-                    if not isinstance(method, basestring):
-                        raise ValueError()
-                    params = req.get('params', [])
-                    if not isinstance(params, list):
-                        raise ValueError()
-                except Exception:
+                id_ = req.get('id', None)
+                method = req.get('method', None)
+                if not isinstance(method, basestring):
+                    raise Error(-32600, u'Invalid Request')
+                params = req.get('params', [])
+                if not isinstance(params, list):
                     raise Error(-32600, u'Invalid Request')
                 
                 method_meth = getattr(self._provider, 'rpc_' + method, None)
@@ -102,9 +97,6 @@ class Server(deferred_resource.DeferredResource):
                 
                 result = yield method_meth(request, *params)
                 error = None
-                
-                if id_ is None:
-                    return
             except Error:
                 raise
             except Exception: