set CONN_MAX_AGE to 0 for ASGI

This commit is contained in:
Laura Klünder 2023-12-08 12:58:44 +01:00
parent 03e0354ba5
commit ac53230f99
2 changed files with 4 additions and 1 deletions

View file

@ -7,6 +7,7 @@ from channels.security.websocket import AllowedHostsOriginValidator
from django.core.asgi import get_asgi_application from django.core.asgi import get_asgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "c3nav.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "c3nav.settings")
os.environ.setdefault("C3NAV_CONN_MAX_AGE", "0")
django_asgi = get_asgi_application() django_asgi = get_asgi_application()
from c3nav.control.middleware import UserPermissionsChannelMiddleware from c3nav.control.middleware import UserPermissionsChannelMiddleware

View file

@ -190,7 +190,9 @@ for key in ('NAME', 'USER', 'PASSWORD', 'HOST', 'PORT'):
DATABASES['default'].setdefault(key, DATA_DIR / 'db.sqlite3' if _db_backend.endswith('sqlite3') DATABASES['default'].setdefault(key, DATA_DIR / 'db.sqlite3' if _db_backend.endswith('sqlite3')
else (f'c3nav_{INSTANCE_NAME}' if INSTANCE_NAME else 'c3nav')) else (f'c3nav_{INSTANCE_NAME}' if INSTANCE_NAME else 'c3nav'))
DATABASES['default'].setdefault('CONN_MAX_AGE', (0 if _db_backend.endswith('sqlite3') else 120)) DATABASES['default'].setdefault('CONN_MAX_AGE',
config.getint('database', 'conn_max_age',
fallback=(0 if _db_backend.endswith('sqlite3') else 120)))
DATABASES['default'].setdefault('CONN_HEALTH_CHECKS', not _db_backend.endswith('sqlite3')) DATABASES['default'].setdefault('CONN_HEALTH_CHECKS', not _db_backend.endswith('sqlite3'))
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'