git.fiddlerwoaroof.com
Browse code

jsonrpc.server-- changes to eventhandler.log and where this function is called

Ed L authored on 22/06/2011 20:05:51
Showing 3 changed files
... ...
@@ -68,7 +68,7 @@ class ServerEvents(object):
68 68
 		'''Override to implement custom handling of the method result and request'''
69 69
 		return result
70 70
 
71
-	def log(self, response, txrequest):
71
+	def log(self, response, txrequest, error=False):
72 72
 		'''Override to implement custom error handling'''
73 73
 		pass
74 74
 
... ...
@@ -167,7 +167,7 @@ class JSON_RPC(Resource):
167 167
 
168 168
 	def _cbRender(self, result, request):
169 169
 		self._setresponseCode(result, request)
170
-		self.eventhandler.log(result, request)
170
+		self.eventhandler.log(result, request, error=False)
171 171
 		if result is not None:
172 172
 			request.setHeader("content-type", 'application/json')
173 173
 			result = jsonrpc.jsonutil.encode(result).encode('utf-8')
... ...
@@ -176,17 +176,16 @@ class JSON_RPC(Resource):
176 176
 		request.finish()
177 177
 
178 178
 	def _ebRender(self, result, request, id, finish=True):
179
-
180 179
 		err = None
181 180
 		if not isinstance(result, BaseException):
182 181
 			try: result.raiseException()
183 182
 			except BaseException, e:
184 183
 				err = e
184
+				self.eventhandler.log(err, request, error=True)
185 185
 		else: err = result
186 186
 
187 187
 		err = self.render_error(err, id)
188 188
 		self._setresponseCode(err, request)
189
-		self.eventhandler.log(err, request)
190 189
 
191 190
 		request.setHeader("content-type", 'application/json')
192 191
 		result = jsonrpc.jsonutil.encode(err).encode('utf-8')
... ...
@@ -57,7 +57,7 @@ def _render(resource, request):
57 57
         raise ValueError("Unexpected return value: %r" % (result,))
58 58
 
59 59
 class SimpleEventHandler(jsonrpc.server.ServerEvents):
60
-	def log(self, result, request): pass
60
+	def log(self, result, request, error=False): pass
61 61
 
62 62
 	def findmethod(self, method):
63 63
 		if method in set(['echo', 'add']):
... ...
@@ -1,11 +1,11 @@
1 1
 from distutils.core import setup
2 2
 
3
-VERSION = "0.99a01"
3
+VERSION = "0.99a02"
4 4
 URLBASE = "https://github.com/NCMI/jsonrpc"
5 5
 URLMAP = {
6 6
 	"daily": "tarball/master",
7
-	"0.99a01": "0.99a",
8
-	"0.99a02": "tarball/0.99a2",
7
+	"0.99a01": "tarball/0.99a",
8
+	"0.99a02": "tarball/0.99a02",
9 9
 }
10 10
 
11 11
 if __name__ == "__main__":
... ...
@@ -15,8 +15,8 @@ if __name__ == "__main__":
15 15
 		description='A JSON-RPC 2.0 client-server library',
16 16
 		author='Edward Langley',
17 17
 		author_email='langleyedward@gmail.com',
18
-		url='https://github.com/NCMI/jsonrpc',
19
-		download_url=URLMAP.get(VERSION, URLMAP['daily']),
18
+		url=URLBASE,
19
+		download_url='/'.join([URLBASE, URLMAP.get(VERSION, URLMAP['daily'])]),
20 20
 		packages=[
21 21
 			'jsonrpc'
22 22
 			],