|
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 |
|
167 | 167 | SITE_ID = 1 |
168 | 168 |
|
169 | 169 | db_conn_max_age = env.int("DJANGO_DB_CONN_MAX_AGE", 60) |
170 | | -DJANGO_DB_CONN_MAX_AGE = None if db_conn_max_age == -1 else db_conn_max_age |
| 170 | +DJANGO_DB_CONN_MAX_AGE = 0 if db_conn_max_age == -1 else db_conn_max_age |
171 | 171 |
|
172 | 172 | DATABASE_ROUTERS = ["app.routers.PrimaryReplicaRouter"] |
173 | 173 | NUM_DB_REPLICAS = 0 |
|
260 | 260 |
|
261 | 261 | # Task processor database — OPTIONALLY SEPARATED |
262 | 262 | TASK_PROCESSOR_DATABASE_URL = env("TASK_PROCESSOR_DATABASE_URL", default=None) |
263 | | -TASK_PROCESSOR_DATABASE_USER = env("TASK_PROCESSOR_DATABASE_USER", default=None) |
| 263 | +TASK_PROCESSOR_DATABASE_USER = env("TASK_PROCESSOR_DATABASE_USER", default="") |
264 | 264 | TASK_PROCESSOR_DATABASE_PASSWORD = env( |
265 | 265 | "TASK_PROCESSOR_DATABASE_PASSWORD", |
266 | | - default=None, |
| 266 | + default="", |
267 | 267 | ) |
268 | | -TASK_PROCESSOR_DATABASE_HOST = env("TASK_PROCESSOR_DATABASE_HOST", default=None) |
269 | | -TASK_PROCESSOR_DATABASE_PORT = env("TASK_PROCESSOR_DATABASE_PORT", default=None) |
270 | | -TASK_PROCESSOR_DATABASE_NAME = env("TASK_PROCESSOR_DATABASE_NAME", default=None) |
| 268 | +TASK_PROCESSOR_DATABASE_HOST = env("TASK_PROCESSOR_DATABASE_HOST", default="") |
| 269 | +TASK_PROCESSOR_DATABASE_PORT = env("TASK_PROCESSOR_DATABASE_PORT", default="") |
| 270 | +TASK_PROCESSOR_DATABASE_NAME = env("TASK_PROCESSOR_DATABASE_NAME", default="") |
271 | 271 |
|
272 | 272 | if TASK_PROCESSOR_DATABASE_URL or TASK_PROCESSOR_DATABASE_NAME: # pragma: no cover |
273 | 273 | if TASK_PROCESSOR_DATABASE_URL: |
|
0 commit comments