From cb9c23e59182481248c13b8da5dce2673c105694 Mon Sep 17 00:00:00 2001 From: Marcel Kornblum Date: Wed, 15 Jan 2025 18:11:34 +0000 Subject: [PATCH] Friendlier local logging (#69) --- config/settings/base.py | 22 ++++++++++++++++++++++ config/settings/developer.py | 5 +++++ docker-compose.yml | 4 +++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/config/settings/base.py b/config/settings/base.py index 6a43fcbb..beb7c57a 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -158,6 +158,10 @@ "asim_formatter": { "()": DDASIMFormatter, }, + "simple": { + "format": "{asctime} {levelname} {message}", + "style": "{", + }, }, "handlers": { "asim": { @@ -165,6 +169,10 @@ "formatter": "asim_formatter", # "filters": ["request_id_context"], }, + "simple": { + "class": "logging.StreamHandler", + "formatter": "simple", + }, "stdout": { "class": "logging.StreamHandler", "formatter": "asim_formatter", @@ -190,6 +198,20 @@ "level": os.getenv("DJANGO_LOG_LEVEL", "INFO"), "propagate": False, }, + "django.server": { + "handlers": [ + "stdout", + ], + "level": os.getenv("DJANGO_SERVER_LOG_LEVEL", "INFO"), + "propagate": False, + }, + "django.db.backends": { + "handlers": [ + "stdout", + ], + "level": os.getenv("DJANGO_DB_LOG_LEVEL", "INFO"), + "propagate": False, + }, "requestlogs": { "handlers": [ "asim", diff --git a/config/settings/developer.py b/config/settings/developer.py index 372d75e9..c6ff4c9a 100644 --- a/config/settings/developer.py +++ b/config/settings/developer.py @@ -8,3 +8,8 @@ ) MIDDLEWARE.remove("authbroker_client.middleware.ProtectAllViewsMiddleware") + +LOGGING["loggers"]["django"]["handlers"] = ["simple"] # type:ignore +LOGGING["loggers"]["django.request"]["handlers"] = ["simple"] # type:ignore +LOGGING["loggers"]["django.server"]["handlers"] = ["simple"] # type:ignore +LOGGING["loggers"]["django.db.backends"]["handlers"] = ["simple"] # type:ignore diff --git a/docker-compose.yml b/docker-compose.yml index c8741e03..3d6b5a91 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,8 @@ services: - redis environment: - DJANGO_SETTINGS_MODULE=config.settings.developer + - DD_TRACE_ENABLED=False + - DD_INSTRUMENTATION_TELEMETRY_ENABLED=False stdin_open: true tty: true @@ -28,4 +30,4 @@ services: redis: image: redis:7.4.0 ports: - - "6379:6379" \ No newline at end of file + - "6379:6379"