From d60a279683ef069712f10106deb43e297f092b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Sun, 24 Nov 2024 11:10:22 +0100 Subject: [PATCH] f --- BREAKING_CHANGES.md | 2 +- acceptance_tests/gunicorn_app/production.ini | 4 ++-- acceptance_tests/waitress_app/production.ini | 4 ++-- c2cwsgiutils/setup_process.py | 2 +- production.ini | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BREAKING_CHANGES.md b/BREAKING_CHANGES.md index adcfc9574..0270877c3 100644 --- a/BREAKING_CHANGES.md +++ b/BREAKING_CHANGES.md @@ -3,7 +3,7 @@ ## Release 6.1 - The `handlers` in the `.ini` files don't support `args` anymore. You must use `kwargs` - arguments. Example `args = (sys.stdout,)` becomes `kwargs = {'stream': 'ext://sys.stdout'}`. + arguments. Example `args = (sys.stdout,)` becomes `kwargs = {'stream': sys.stdout}`. - SqlAlchemy logger must now be instantiated by your app's `main` method and not by your `.ini` file. Read the example in the sqlalchemylogger folder. diff --git a/acceptance_tests/gunicorn_app/production.ini b/acceptance_tests/gunicorn_app/production.ini index 81cdad93e..3fb07fbdf 100644 --- a/acceptance_tests/gunicorn_app/production.ini +++ b/acceptance_tests/gunicorn_app/production.ini @@ -86,13 +86,13 @@ qualname = c2cwsgiutils_app [handler_console] class = logging.StreamHandler -kwargs = {'stream': 'ext://sys.stdout'} +kwargs = {'stream': sys.stdout} level = NOTSET formatter = generic [handler_json] class = c2cwsgiutils.pyramid_logging.JsonLogHandler -kwargs = {'stream': 'ext://sys.stdout'} +kwargs = {'stream': sys.stdout} level = NOTSET formatter = generic diff --git a/acceptance_tests/waitress_app/production.ini b/acceptance_tests/waitress_app/production.ini index 595b7c549..16a202756 100644 --- a/acceptance_tests/waitress_app/production.ini +++ b/acceptance_tests/waitress_app/production.ini @@ -88,13 +88,13 @@ qualname = c2cwsgiutils_app [handler_console] class = logging.StreamHandler -kwargs = {'stream': 'ext://sys.stdout'} +kwargs = {'stream': sys.stdout} level = NOTSET formatter = generic [handler_json] class = c2cwsgiutils.pyramid_logging.JsonLogHandler -kwargs = {'stream': 'ext://sys.stdout'} +kwargs = {'stream': sys.stdout} level = NOTSET formatter = generic diff --git a/c2cwsgiutils/setup_process.py b/c2cwsgiutils/setup_process.py index 329d6c861..db91950e9 100644 --- a/c2cwsgiutils/setup_process.py +++ b/c2cwsgiutils/setup_process.py @@ -13,7 +13,7 @@ import pyramid.registry import pyramid.request import pyramid.router -from pyramid.paster import bootstrap +from pyramid.paster import bootstrap, setup_logging from pyramid.scripts.common import get_config_loader, parse_vars from c2cwsgiutils import broadcast, coverage_setup, redis_stats, sentry, sql_profiler diff --git a/production.ini b/production.ini index 1d177ea70..542bd2adb 100644 --- a/production.ini +++ b/production.ini @@ -31,13 +31,13 @@ qualname = c2cwsgiutils [handler_console] class = logging.StreamHandler -kwargs = {'stream': 'ext://sys.stdout'} +kwargs = {'stream': sys.stdout} level = NOTSET formatter = generic [handler_json] class = c2cwsgiutils.pyramid_logging.JsonLogHandler -kwargs = {'stream': 'ext://sys.stdout'} +kwargs = {'stream': sys.stdout} level = NOTSET formatter = generic