Expose configuration to allow db connections to be reused (#1599)

This commit is contained in:
Mark Street
2025-06-10 16:20:53 +02:00
committed by GitHub
parent e0021bf625
commit 85a2feea6e
2 changed files with 11 additions and 1 deletions
+2
View File
@@ -294,6 +294,8 @@ jobs:
echo 'POSTGRES_PASSWORD=decompme' >> docker.prod.env
echo 'SECRET_KEY=secret-key-secret-key-secret-key-secret-key-secret-key-secret-key' >> docker.prod.env
echo 'DATABASE_URL=psql://decompme:decompme@postgres:5432/decompme' >> docker.prod.env
echo 'CONN_MAX_AGE=60' >> docker.prod.env
echo 'CONN_HEALTH_CHECKS="true"' >> docker.prod.env
echo 'SANDBOX_DISABLE_PROC="true"' >> docker.prod.env
echo 'ALLOWED_HOSTS="backend,localhost,127.0.0.1"' >> docker.prod.env
echo 'USE_SANDBOX_JAIL="on"' >> docker.prod.env
+9 -1
View File
@@ -45,6 +45,8 @@ env = environ.Env(
SESSION_COOKIE_AGE=(int, 60 * 60 * 24 * 90), # default: 90 days
SESSION_EXPIRE_AFTER_LAST_ACTIVITY=(bool, True),
SESSION_TIMEOUT_REDIRECT=(str, "/"),
CONN_MAX_AGE=(int, 0), # default: a new connection for each request
CONN_HEALTH_CHECKS=(bool, False),
)
for stem in [".env.local", ".env"]:
@@ -115,7 +117,13 @@ TEMPLATES = [
WSGI_APPLICATION = "decompme.wsgi.application"
DATABASES = {"default": env.db()}
DATABASES = {
"default": {
**env.db(),
"CONN_MAX_AGE": env("CONN_MAX_AGE"),
"CONN_HEALTH_CHECKS": env("CONN_HEALTH_CHECKS"),
},
}
# Password validation
# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators