summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-11-09 10:13:29 +0100
committerClaude Paroz <claude@2xlibre.net>2013-11-09 16:23:14 +0100
commite7383f16b438a03ea2258a49e4889fd6e2303e53 (patch)
tree41c25e1cf1999a26e82a414571ec7a242c71d568
parent98de90d3d81f5db9e969e70b8ce3f0e368726208 (diff)
Fixed #14800 -- Suppressed WSGIRequestHandler message filtering
Filtering out static file requests in runserver has been judged arbitrary and can hide some debugging-related activity. Thanks Roy Smith for the report and Aymeric Augustin for the review.
-rw-r--r--django/core/servers/basehttp.py11
-rw-r--r--docs/releases/1.7.txt3
2 files changed, 3 insertions, 11 deletions
diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py
index 0e6d0d437c..d34c246d51 100644
--- a/django/core/servers/basehttp.py
+++ b/django/core/servers/basehttp.py
@@ -19,7 +19,6 @@ from wsgiref.util import FileWrapper # NOQA: for backwards compatibility
from django.core.management.color import color_style
from django.core.wsgi import get_wsgi_application
from django.utils.module_loading import import_by_path
-from django.utils.six.moves.urllib.parse import urljoin
from django.utils.six.moves import socketserver
__all__ = ('WSGIServer', 'WSGIRequestHandler', 'MAX_SOCKET_CHUNK_SIZE')
@@ -116,11 +115,6 @@ class WSGIServer(simple_server.WSGIServer, object):
class WSGIRequestHandler(simple_server.WSGIRequestHandler, object):
def __init__(self, *args, **kwargs):
- from django.conf import settings
- self.admin_static_prefix = urljoin(settings.STATIC_URL, 'admin/')
- # We set self.path to avoid crashes in log_message() on unsupported
- # requests (like "OPTIONS").
- self.path = ''
self.style = color_style()
super(WSGIRequestHandler, self).__init__(*args, **kwargs)
@@ -129,11 +123,6 @@ class WSGIRequestHandler(simple_server.WSGIRequestHandler, object):
return self.client_address[0]
def log_message(self, format, *args):
- # Don't bother logging requests for admin images or the favicon.
- if (self.path.startswith(self.admin_static_prefix)
- or self.path == '/favicon.ico'):
- return
-
msg = "[%s] %s\n" % (self.log_date_time_string(), format % args)
# Utilize terminal colors, if available
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index e32e60be35..2aab6f26a7 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -383,6 +383,9 @@ Management Commands
translation file is updated, i.e. after running
:djadmin:`compilemessages`.
+ * All HTTP requests are logged to the console, including requests for static
+ files or ``favicon.ico`` that used to be filtered out.
+
Models
^^^^^^