|
16 | 16 | import warnings |
17 | 17 | from datetime import datetime, time, timedelta |
18 | 18 |
|
19 | | -import dj_database_url # type: ignore[import-untyped] |
| 19 | +import dj_database_url |
20 | 20 | import django_stubs_ext |
21 | 21 | import prometheus_client |
22 | 22 | import pytz |
|
168 | 168 | SITE_ID = 1 |
169 | 169 |
|
170 | 170 | db_conn_max_age = env.int("DJANGO_DB_CONN_MAX_AGE", 60) |
171 | | -DJANGO_DB_CONN_MAX_AGE = None if db_conn_max_age == -1 else db_conn_max_age |
| 171 | +DJANGO_DB_CONN_MAX_AGE = 0 if db_conn_max_age == -1 else db_conn_max_age |
172 | 172 |
|
173 | 173 | DATABASE_ROUTERS = ["app.routers.PrimaryReplicaRouter"] |
174 | 174 | NUM_DB_REPLICAS = 0 |
|
261 | 261 |
|
262 | 262 | # Task processor database — OPTIONALLY SEPARATED |
263 | 263 | TASK_PROCESSOR_DATABASE_URL = env("TASK_PROCESSOR_DATABASE_URL", default=None) |
264 | | -TASK_PROCESSOR_DATABASE_USER = env("TASK_PROCESSOR_DATABASE_USER", default=None) |
| 264 | +TASK_PROCESSOR_DATABASE_USER = env("TASK_PROCESSOR_DATABASE_USER", default="") |
265 | 265 | TASK_PROCESSOR_DATABASE_PASSWORD = env( |
266 | 266 | "TASK_PROCESSOR_DATABASE_PASSWORD", |
267 | | - default=None, |
| 267 | + default="", |
268 | 268 | ) |
269 | | -TASK_PROCESSOR_DATABASE_HOST = env("TASK_PROCESSOR_DATABASE_HOST", default=None) |
270 | | -TASK_PROCESSOR_DATABASE_PORT = env("TASK_PROCESSOR_DATABASE_PORT", default=None) |
271 | | -TASK_PROCESSOR_DATABASE_NAME = env("TASK_PROCESSOR_DATABASE_NAME", default=None) |
| 269 | +TASK_PROCESSOR_DATABASE_HOST = env("TASK_PROCESSOR_DATABASE_HOST", default="") |
| 270 | +TASK_PROCESSOR_DATABASE_PORT = env("TASK_PROCESSOR_DATABASE_PORT", default="") |
| 271 | +TASK_PROCESSOR_DATABASE_NAME = env("TASK_PROCESSOR_DATABASE_NAME", default="") |
272 | 272 |
|
273 | 273 | if TASK_PROCESSOR_DATABASE_URL or TASK_PROCESSOR_DATABASE_NAME: # pragma: no cover |
274 | 274 | if TASK_PROCESSOR_DATABASE_URL: |
|
0 commit comments