Ticket #14800: optional-14800.diff

django/core/management/commands/runserver.py

@@ -26 +26 @@
             help='Tells Django to NOT use threading.'),
         make_option('--noreload', action='store_false', dest='use_reloader', default=True,
             help='Tells Django to NOT use the auto-reloader.'),
+        make_option('--verbose-logging', action='store_true', dest='verbose_logging', default=False,
+            help='Tells Django to log all requests including those to admin media files and /favicon.ico'),
     )
     help = "Starts a lightweight Web server for development."
     args = '[optional port number, or ipaddr:port]'
@@ -111 +113 @@
         try:
             handler = self.get_handler(*args, **options)
             run(self.addr, int(self.port), handler,
-                ipv6=self.use_ipv6, threading=threading)
+                ipv6=self.use_ipv6, threading=threading,
+                verbose_logging=options.get('verbose_logging', False))
         except WSGIServerException as e:
             # Use helpful error messages instead of ugly tracebacks.
             ERRORS = {

django/core/servers/basehttp.py

@@ -126 +126 @@
 
 
 class WSGIRequestHandler(simple_server.WSGIRequestHandler, object):
+    verbose_logging = False
 
     def __init__(self, *args, **kwargs):
         from django.conf import settings
@@ -142 +143 @@
 
     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'):
+        if not self.verbose_logging and (
+                (self.path.startswith(self.admin_static_prefix)
+                or self.path == '/favicon.ico')):
             return
 
         msg = "[%s] %s\n" % (self.log_date_time_string(), format % args)
@@ -169 +171 @@
         sys.stderr.write(msg)
 
 
-def run(addr, port, wsgi_handler, ipv6=False, threading=False):
+def get_request_handler(**options):
+    handler_cls = WSGIRequestHandler
+    if not options.get('verbose_logging', False):
+        return handler_cls
+    return type(str('WSGIRequestHandler'), (handler_cls,), options)
+
+
+def run(addr, port, wsgi_handler, ipv6=False, threading=False,
+        verbose_logging=False):
     server_address = (addr, port)
     if threading:
         httpd_cls = type(str('WSGIServer'), (socketserver.ThreadingMixIn, WSGIServer), {})
     else:
         httpd_cls = WSGIServer
-    httpd = httpd_cls(server_address, WSGIRequestHandler, ipv6=ipv6)
+    httpd = httpd_cls(server_address, 
+        get_request_handler(verbose_logging=verbose_logging),
+        ipv6=ipv6)
     httpd.set_app(wsgi_handler)
     httpd.serve_forever()