Merge pull request FutureMind#3 from oasiswork/feature-add-catch-all-…

…exception Add settings to catch all exception as friendly errors
mathesar-foundation · Apr 14, 2016 · ab40b74 · ab40b74
2 parents a0959e6 + f12120d
commit ab40b74
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/rest_framework_friendly_errors/handlers.py b/rest_framework_friendly_errors/handlers.py
@@ -1,4 +1,5 @@
 from rest_framework.views import exception_handler
+from rest_framework.exceptions import APIException
 
 from rest_framework_friendly_errors import settings
 from rest_framework_friendly_errors.utils import is_pretty
@@ -7,6 +8,10 @@
 def friendly_exception_handler(exc, context):
     response = exception_handler(exc, context)
 
+    if not response and settings.CATCH_ALL_EXCEPTIONS:
+        exc = APIException(exc)
+        response = exception_handler(exc, context)
+
     if response is not None:
         if is_pretty(response):
             return response

diff --git a/rest_framework_friendly_errors/settings.py b/rest_framework_friendly_errors/settings.py
@@ -17,6 +17,9 @@
 VALIDATION_FAILED_MESSAGE = USER_SETTINGS.get('VALIDATION_FAILED_MESSAGE',
                                               _('Validation Failed'))
 
+CATCH_ALL_EXCEPTIONS = USER_SETTINGS.get(
+    'CATCH_ALL_EXCEPTIONS', False)
+
 FRIENDLY_FIELD_ERRORS = {
     'BooleanField': {'required': 2001, 'invalid': 2011, 'null': 2021},
     'NullBooleanField': {'required': 2001, 'invalid': 2011, 'null': 2021},