Add specific exception

internap · Mar 14, 2017 · d72f73c · d72f73c
1 parent 19a293c
commit d72f73c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -19,6 +19,7 @@
 import unittest
 
 from ubersmith_remote_module_server.api import Api
+from ubersmith_remote_module_server.exceptions import RemoteModuleException
 
 
 class ApiTest(unittest.TestCase):
@@ -69,7 +70,7 @@ def test_execute_method_returns_string(self):
         assert_that(output.status_code, is_(200))
 
     def test_execute_method_raise_an_exception(self):
-        self.router.invoke_method.side_effect = Exception('Some Error')
+        self.router.invoke_method.side_effect = RemoteModuleException('Some Error')
         output = self.api_client.post(self.generate_module_path('module2'),
                                       headers={'Content-Type': 'application/json'},
                                       data=json.dumps(

diff --git a/ubersmith_remote_module_server/api.py b/ubersmith_remote_module_server/api.py
@@ -17,6 +17,7 @@
 import logging
 
 from flask import request, current_app
+from ubersmith_remote_module_server.exceptions import RemoteModuleException
 
 
 class Api(object):
@@ -44,7 +45,8 @@ def handle_remote_invocation(self, module):
         try:
             output = self.router.invoke_method(module=module, **data)
             return json_response(output, 200)
-        except Exception as e:
+        except RemoteModuleException as e:
+            logging.exception(e)
             return json_response(str(e), 500)
 
 

diff --git a/ubersmith_remote_module_server/exceptions.py b/ubersmith_remote_module_server/exceptions.py
@@ -23,3 +23,7 @@ class NamedArgumentsOnly(Exception):
     def __init__(self, msg="UbersmithCore was called with non-named arguments, "
                            "you MUST use named arguments (kwargs)"):
         super(NamedArgumentsOnly, self).__init__(msg)
+
+
+class RemoteModuleException(Exception):
+    pass