diff options
Diffstat (limited to 'module/remote/wsbackend/ApiHandler.py')
| -rw-r--r-- | module/remote/wsbackend/ApiHandler.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/module/remote/wsbackend/ApiHandler.py b/module/remote/wsbackend/ApiHandler.py index 57d9ecd5b..e8ba80982 100644 --- a/module/remote/wsbackend/ApiHandler.py +++ b/module/remote/wsbackend/ApiHandler.py @@ -34,14 +34,15 @@ class ApiHandler(AbstractHandler): Non json request will be ignored. """ + PATH = "/api" + def transfer_data(self, req): while True: try: line = receive_message(req) except TypeError, e: # connection closed self.log.debug("WS Error: %s" % e) - self.passive_closing_handshake(req) - return + return self.passive_closing_handshake(req) self.handle_message(line, req) @@ -55,30 +56,31 @@ class ApiHandler(AbstractHandler): user = self.api.checkAuth(*args, **kwargs) if user: req.api = self.api.withUserContext(user.uid) - return self.send_result(req, 200, True) + return self.send_result(req, self.OK, True) else: - return self.send_result(req, 403, "Forbidden") + return self.send_result(req, self.FORBIDDEN, "Forbidden") elif func == 'logout': req.api = None - return self.send_result(req, 200, True) + return self.send_result(req, self.OK, True) else: if not req.api: - return self.send_result(req, 403, "Forbidden") + return self.send_result(req, self.FORBIDDEN, "Forbidden") if not self.api.isAuthorized(func, req.api.user): - return self.send_result(req, 401, "Unauthorized") + return self.send_result(req, self.UNAUTHORIZED, "Unauthorized") try: result = getattr(req.api, func)(*args, **kwargs) except AttributeError: - return self.send_result(req, 404, "Not Found") + return self.send_result(req, self.NOT_FOUND, "Not Found") except Exception, e: - return self.send_result(req, 500, str(e)) + self.core.print_exc() + return self.send_result(req, self.ERROR, str(e)) # None is invalid json type if result is None: result = True - return self.send_result(req, 200, result)
\ No newline at end of file + return self.send_result(req, self.OK, result)
\ No newline at end of file |