logging: Use django.server to filter 200 and 304.

Previously, we were monkey patching the runserver command in zerver/management/commands/rundjango.py for this.
skapil · Feb 10, 2017 · ef0d2a4 · ef0d2a4
1 parent 85fbdd6
commit ef0d2a4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/tools/run-dev.py b/tools/run-dev.py
@@ -149,7 +149,7 @@
 # Pass --nostatic because we configure static serving ourselves in
 # zulip/urls.py.
 cmds = [['./tools/compile-handlebars-templates', 'forever'],
-        ['./manage.py', 'rundjango'] +
+        ['./manage.py', 'runserver'] +
         manage_args + ['127.0.0.1:%d' % (django_port,)],
         ['env', 'PYTHONUNBUFFERED=1', './manage.py', 'runtornado'] +
         manage_args + ['127.0.0.1:%d' % (tornado_port,)],

diff --git a/zerver/lib/logging_util.py b/zerver/lib/logging_util.py
@@ -61,3 +61,13 @@ def filter(self, record):
         # type: (logging.LogRecord) -> bool
         from django.conf import settings
         return settings.PRODUCTION
+
+def skip_200_and_304(record):
+    # type: (logging.LogRecord) -> bool
+    # Apparently, `status_code` is added by Django and is not an actual
+    # attribute of LogRecord; as a result, mypy throws an error if we
+    # access the `status_code` attribute directly.
+    if getattr(record, 'status_code') in [200, 304]:
+        return False
+
+    return True
diff --git a/zerver/management/commands/rundjango.py b/zerver/management/commands/rundjango.py
diff --git a/zproject/settings.py b/zproject/settings.py
@@ -18,6 +18,7 @@
 import six.moves.configparser
 
 from zerver.lib.db import TimeTrackingConnection
+import zerver.lib.logging_util
 import six
 
 ########################################################################
@@ -969,6 +970,10 @@ def get_secret(key):
         'require_really_deployed': {
             '()': 'zerver.lib.logging_util.RequireReallyDeployed',
         },
+        'skip_200_and_304': {
+            '()': 'django.utils.log.CallbackFilter',
+            'callback': zerver.lib.logging_util.skip_200_and_304,
+        },
     },
     'handlers': {
         'zulip_admins': {
@@ -1032,6 +1037,10 @@ def get_secret(key):
             'handlers': ['file'],
             'propagate': False,
         },
+        'django.server': {
+            'propagate': False,
+            'filters': ['skip_200_and_304'],
+        },
         ## Uncomment the following to get all database queries logged to the console
         # 'django.db': {
         #     'handlers': ['console'],