From fb2102ecedfba300e2a93d0c78c8e71f4da434d6 Mon Sep 17 00:00:00 2001 From: Jace Browning Date: Sat, 13 Aug 2022 11:26:21 -0400 Subject: [PATCH] Make DEBUG configurable --- .vscode/settings.json | 2 ++ Makefile | 1 + Procfile.dev | 2 +- app/main.py | 1 + app/settings.py | 2 +- app/tests/conftest.py | 1 + 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9b8581e12..97a25b998 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -35,6 +35,7 @@ "getbbox", "getenv", "getoffset", + "getplugin", "gjpqy", "Googlebot", "Groupon", @@ -66,6 +67,7 @@ "Panik", "Philosoraptor", "Photoshop", + "pluginmanager", "podman", "PYTHONASYNCIODEBUG", "PYTHONUNBUFFERED", diff --git a/Makefile b/Makefile index 7447baa96..f96542d9a 100644 --- a/Makefile +++ b/Makefile @@ -144,3 +144,4 @@ promote: install .envrc echo >> $@ echo "export CF_API_KEY=???" >> $@ echo "export REMOTE_TRACKING_URL=???" >> $@ + echo "export DEBUG=true" >> $@ diff --git a/Procfile.dev b/Procfile.dev index 0d3ba16d3..53b173810 100644 --- a/Procfile.dev +++ b/Procfile.dev @@ -1,2 +1,2 @@ -api: DEBUG=true PYTHONUNBUFFERED=1 PYTHONASYNCIODEBUG=1 python app/main.py +api: DEBUG="${DEBUG:-true}" PYTHONUNBUFFERED=1 PYTHONASYNCIODEBUG=1 python app/main.py site: mkdocs serve --dev-addr localhost:5001 diff --git a/app/main.py b/app/main.py index 6d06c32da..6c54a2ad2 100644 --- a/app/main.py +++ b/app/main.py @@ -43,6 +43,7 @@ async def robots(request): host="0.0.0.0", port=5000, debug=settings.DEBUG, + auto_reload=True, access_log=False, motd=False, fast=True, diff --git a/app/settings.py b/app/settings.py index 2164da24d..e99b83593 100644 --- a/app/settings.py +++ b/app/settings.py @@ -7,7 +7,7 @@ # Server configuration -DEBUG = bool(os.environ.get("DEBUG", False)) +DEBUG = os.environ.get("DEBUG", "false") == "true" if "DOMAIN" in os.environ: # staging / production SERVER_NAME = os.environ["DOMAIN"] diff --git a/app/tests/conftest.py b/app/tests/conftest.py index ca4de8085..dd0fcdea0 100644 --- a/app/tests/conftest.py +++ b/app/tests/conftest.py @@ -11,6 +11,7 @@ def pytest_configure(config): terminal = config.pluginmanager.getplugin("terminal") terminal.TerminalReporter.showfspath = False settings.ALLOWED_EXTENSIONS.append("apng") + settings.DEBUG = False def pytest_runtest_setup(item):