Merge branch 'django' into django+add-role-viewset

1 files changed, 18 insertions, 2 deletions

diff --git a/pysite/settings.py b/pysite/settings.py
index 5badde5c..0175fb46 100644
--- a/pysite/settings.py
+++ b/pysite/settings.py
@@ -11,7 +11,7 @@ https://docs.djangoproject.com/en/2.1/ref/settings/
 """
 
 import os
-# import sys
+import sys
 
 import environ
 
@@ -73,6 +73,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
 
     'django_hosts',
+    'django_filters',
     'rest_framework',
     'rest_framework.authtoken'
 ]
@@ -207,7 +208,22 @@ LOGGING = {
         'django': {
             'handlers': ['console'],
             'propagate': True,
-            'level': 'INFO' if DEBUG else env('LOG_LEVEL', default='WARN')
+            'level': env(
+                'LOG_LEVEL',
+                default=(
+                    # If there is no explicit `LOG_LEVEL` set,
+                    # use `DEBUG` if we're running in debug mode but not
+                    # testing. Use `ERROR` if we're running tests, else
+                    # default to using `WARN`.
+                    'DEBUG'
+                    if DEBUG and 'test' not in sys.argv
+                    else (
+                        'ERROR'
+                        if 'test' in sys.argv
+                        else 'WARN'
+                    )
+                )
+            )
         }
     }
 }