From 2f8baecd680992faed889c95651cb4fef2d3fcb9 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Tue, 22 Sep 2020 17:40:56 +0200 Subject: [PATCH] Fix #1127 -- Set loglevel from configfile (#1777) --- doc/admin/config.rst | 3 +++ src/pretix/settings.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/admin/config.rst b/doc/admin/config.rst index 7cf43b540d..c6de356efe 100644 --- a/doc/admin/config.rst +++ b/doc/admin/config.rst @@ -97,6 +97,9 @@ Example:: ``csp_log`` Log violations of the Content Security Policy (CSP). Defaults to ``on``. + +``loglevel`` + Set console and file loglevel (``DEBUG``, ``INFO``, ``WARNING``, ``ERROR`` or ``CRITICAL``). Defaults to ``INFO``. Locale settings --------------- diff --git a/src/pretix/settings.py b/src/pretix/settings.py index 8fff1d0ea7..0bf158c493 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -561,7 +561,7 @@ MESSAGE_TAGS = { } MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage' -loglevel = 'DEBUG' if DEBUG else 'INFO' +loglevel = 'DEBUG' if DEBUG else config.get('pretix', 'loglevel', fallback='INFO') LOGGING = { 'version': 1,