From 882e238bc31b4b41075c2fff754137c101e35c57 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Fri, 17 Jan 2025 21:33:03 +0100 Subject: [PATCH] Add new defaults for seeing logger output --- src/carbon_txt/web/config/settings/base.py | 15 ++++----- .../web/config/settings/production.py | 7 ++++ src/carbon_txt/web/config/settings/test.py | 32 +++++++++++++++++++ tests/test_plugins/process_document.py | 2 +- 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/src/carbon_txt/web/config/settings/base.py b/src/carbon_txt/web/config/settings/base.py index b1a7dce..84f8f02 100644 --- a/src/carbon_txt/web/config/settings/base.py +++ b/src/carbon_txt/web/config/settings/base.py @@ -44,32 +44,29 @@ "console": { "class": "logging.StreamHandler", "formatter": "plain_console", - # "formatter": "json_formatter", }, "nullhandler": { "class": "logging.NullHandler", }, }, "loggers": { - "django_structlog": { - "handlers": ["console"], - "level": "INFO", - }, + # set our default logger "root": { "handlers": ["console"], "level": "INFO", "propagate": True, }, + "django_structlog": { + "level": "INFO", + }, "httpx": { - "handlers": ["console"], "level": "WARNING", }, "httpcore": { - "handlers": ["console"], "level": "INFO", }, - "carbon_txt.processors": { - "level": "DEBUG", + "carbon_txt": { + "level": "INFO", }, }, } diff --git a/src/carbon_txt/web/config/settings/production.py b/src/carbon_txt/web/config/settings/production.py index 6fcf7d7..d7e6272 100644 --- a/src/carbon_txt/web/config/settings/production.py +++ b/src/carbon_txt/web/config/settings/production.py @@ -5,3 +5,10 @@ WSGI_APPLICATION = "carbon_txt.web.config.wsgi.application" ROOT_URLCONF = "carbon_txt.web.config.urls" + + +# switch to using a logger better suited for production +LOGGING["handlers"]["console"] = { # type: ignore # noqa + "class": "logging.StreamHandler", + "formatter": "key_value", +} diff --git a/src/carbon_txt/web/config/settings/test.py b/src/carbon_txt/web/config/settings/test.py index b3a77bd..17584d7 100644 --- a/src/carbon_txt/web/config/settings/test.py +++ b/src/carbon_txt/web/config/settings/test.py @@ -5,3 +5,35 @@ WSGI_APPLICATION = "carbon_txt.web.config.wsgi.application" ROOT_URLCONF = "carbon_txt.web.config.urls" + +LOGGING["handlers"]["console"] = { # type: ignore # noqa + "class": "logging.StreamHandler", + # "formatter": "key_value", + "formatter": "plain_console", + # "formatter": "json_formatter", +} + +LOGGING["loggers"] = { # type: ignore # noqa + "root": { + "handlers": ["console"], + # make test logs much more quiet. Set this to INFO and specific loggers + # below to DEBUG for troubleshooting + "level": "ERROR", + # "propagate": True, + }, + # "django_structlog": { + # # "level": "ERROR", + # }, + # "httpx": { + # # "level": "WARNING", + # }, + # "httpcore": { + # # "level": "INFO", + # }, + # "carbon_txt": { + # # "level": "INFO", + # }, + # "test_plugin": { + # # "level": "ERROR", + # }, +} diff --git a/tests/test_plugins/process_document.py b/tests/test_plugins/process_document.py index ac1c656..36553bf 100644 --- a/tests/test_plugins/process_document.py +++ b/tests/test_plugins/process_document.py @@ -5,7 +5,7 @@ from structlog import get_logger -logger = get_logger() +logger = get_logger("test_plugin") plugin_name = "test_plugin"