Merge branch 'Simple-optimisation-in-checking-existing-emails' of git…

…hub.com:uktrade/lite-hmrc into Simple-optimisation-in-checking-existing-emails

Pipfile

@@ -23,7 +23,6 @@ elastic-apm = "~=5.8"
 sentry-sdk = "~=0.16"
 typed-ast = "~=1.4.2"
 mohawk = ">=1.1"
-python-json-logger = "~=0.1"
 psycopg2 = "~=2.8"
 python-dateutil = "~=2.8"
 requests = "~=2.21"

conf/settings.py

@@ -15,6 +15,7 @@
 import uuid
 
 from environ import Env
+from django_log_formatter_ecs import ECSFormatter
 
 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
@@ -47,7 +48,7 @@
 DJANGO_SECRET_KEY = env("DJANGO_SECRET_KEY")
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = env.bool("DEBUG", False)
 
 ALLOWED_HOSTS = "*"
 
@@ -187,17 +188,14 @@
         "version": 1,
         "disable_existing_loggers": False,
         "formatters": {
-            "json": {
-                "class": "pythonjsonlogger.jsonlogger.JsonFormatter",
-                "format": "(asctime)(levelname)(message)(filename)(lineno)(threadName)(name)(thread)(created)(process)(processName)(relativeCreated)(module)(funcName)(levelno)(msecs)(pathname)",  # noqa
-            },
-            "ecs_formatter": {"class": "django_log_formatter_ecs.ECSFormatter"},
+            "simple": {"format": "{asctime} {levelname} {message}", "style": "{"},
+            "ecs_formatter": {"()": ECSFormatter},
         },
         "handlers": {
-            "console": {"class": "logging.StreamHandler", "formatter": "json"},
+            "stdout": {"class": "logging.StreamHandler", "formatter": "simple"},
             "ecs": {"class": "logging.StreamHandler", "formatter": "ecs_formatter"},
         },
-        "loggers": {"": {"handlers": ["console", "ecs"], "level": env("LOG_LEVEL").upper()}},
+        "root": {"handlers": ["stdout", "ecs"], "level": env("LOG_LEVEL").upper()},
     }
 else:
     LOGGING = {"version": 1, "disable_existing_loggers": True}