From a786fef06639da439f9edd367db36388dc1c2658 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 2 Jan 2013 22:03:02 +0100 Subject: little cleanup, improved handling of custom exceptions via api --- module/remote/wsbackend/ApiHandler.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'module/remote/wsbackend/ApiHandler.py') diff --git a/module/remote/wsbackend/ApiHandler.py b/module/remote/wsbackend/ApiHandler.py index 52dd05b9f..eec546d47 100644 --- a/module/remote/wsbackend/ApiHandler.py +++ b/module/remote/wsbackend/ApiHandler.py @@ -18,6 +18,8 @@ from mod_pywebsocket.msgutil import receive_message +from module.Api import ExceptionObject + from AbstractHandler import AbstractHandler class ApiHandler(AbstractHandler): @@ -50,7 +52,7 @@ class ApiHandler(AbstractHandler): func, args, kwargs = self.handle_call(msg, req) if not func: - return # Result was already sent + return # handle_call already sent the result if func == 'login': user = self.api.checkAuth(*args, **kwargs) @@ -74,6 +76,8 @@ class ApiHandler(AbstractHandler): try: result = getattr(req.api, func)(*args, **kwargs) + except ExceptionObject, e: + return self.send_result(req, self.BAD_REQUEST, e) except AttributeError: return self.send_result(req, self.NOT_FOUND, "Not Found") except Exception, e: -- cgit v1.2.3