Skip to content

Commit

Permalink
1.3.1dev: merge [15291] from 1.2-stable (fix for #12632)
Browse files Browse the repository at this point in the history
git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@15292 af82e41b-90c4-0310-8c96-b1721e28e2e2
  • Loading branch information
jomae committed Dec 7, 2016
2 parents 6406305 + 19937c8 commit 3d96b62
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions trac/web/main.py
Expand Up @@ -286,9 +286,13 @@ def dispatch(self, req):
except RequestDone:
pass
except Exception as e2:
self.log.error("Exception caught while post-processing"
" request: %s",
exception_to_unicode(e2, traceback=True))
if isinstance(e, TracError):
self.log.warning("Exception caught while post-processing"
" request: %s", exception_to_unicode(e2))
else:
self.log.error("Exception caught while post-processing"
" request: %s",
exception_to_unicode(e2, traceback=True))
if isinstance(e, PermissionError):
raise HTTPForbidden(e)
if isinstance(e, ResourceNotFound):
Expand Down

0 comments on commit 3d96b62

Please sign in to comment.