summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2016-04-14 08:12:35 -0700
committerTim Graham <timograham@gmail.com>2016-04-20 21:02:05 -0400
commit40b69607c751c4afa453edfd41d2ed155e58187e (patch)
treef1c4354073569aff25271f3d497183e302b88058 /django
parent5e00b14403db75d83a274864ecd008d0e826c61d (diff)
Fixed #26504 -- Avoided logging "Not Found" warnings if a middleware handles the 404.
For example, this avoids a warning in the case of a request that's redirected to a language-prefixed URL by LocaleMiddleware.
Diffstat (limited to 'django')
-rw-r--r--django/core/handlers/base.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
index 69cd2b030f..cbdaea5a97 100644
--- a/django/core/handlers/base.py
+++ b/django/core/handlers/base.py
@@ -179,10 +179,6 @@ class BaseHandler(object):
response_is_rendered = True
except http.Http404 as exc:
- logger.warning(
- 'Not Found: %s', request.path,
- extra={'status_code': 404, 'request': request},
- )
if settings.DEBUG:
response = debug.technical_404_response(request, exc)
else:
@@ -246,6 +242,12 @@ class BaseHandler(object):
if not response_is_rendered and callable(getattr(response, 'render', None)):
response = response.render()
+ if response.status_code == 404:
+ logger.warning(
+ 'Not Found: %s', request.path,
+ extra={'status_code': 404, 'request': request},
+ )
+
return response
def process_exception_by_middleware(self, exception, request):