Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Better exception handling (#2128)

Browse Source 
* WIP for better exception handling

* Note about removal

* resolve conditional to reduce lookups

* Cleanup logic
This commit is contained in:
Adam Hopkins 2021-06-21 14:14:07 +03:00 committed by GitHub
parent 5bb9aa0c2c
commit 80fca9aef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sanic/handlers.py
View File

@ -25,7 +25,6 @@ class ErrorHandler:
handlers = None handlers = None
cached_handlers = None cached_handlers = None
_missing = object()
def __init__(self): def __init__(self):
self.handlers = [] self.handlers = []
@ -45,7 +44,9 @@ class ErrorHandler:
:return: None :return: None
""" """
# self.handlers to be deprecated and removed in version 21.12
self.handlers.append((exception, handler)) self.handlers.append((exception, handler))
self.cached_handlers[exception] = handler
def lookup(self, exception): def lookup(self, exception):
""" """
@ -61,13 +62,18 @@ class ErrorHandler:
:return: Registered function if found ``None`` otherwise :return: Registered function if found ``None`` otherwise
""" """
handler = self.cached_handlers.get(type(exception), self._missing) exception_class = type(exception)
if handler is self._missing: if exception_class in self.cached_handlers:
for exception_class, handler in self.handlers: return self.cached_handlers[exception_class]
if isinstance(exception, exception_class):
self.cached_handlers[type(exception)] = handler for ancestor in type.mro(exception_class):
if ancestor in self.cached_handlers:
handler = self.cached_handlers[ancestor]
self.cached_handlers[exception_class] = handler
return handler return handler
self.cached_handlers[type(exception)] = None if ancestor is BaseException:
break
self.cached_handlers[exception_class] = None
handler = None handler = None
return handler return handler