feat(controller): set CONN_MAX_AGE from env var

Kingdon Barrett · Kingdon Barrett · commit 11c9e66d5b12 · 2020-11-22T21:40:51.000-05:00
diff --git a/rootfs/api/settings/production.py b/rootfs/api/settings/production.py
@@ -27,8 +27,6 @@
     'security.W008'
 ]
 
-CONN_MAX_AGE = 60 * 3
-
 # SECURITY: change this to allowed fqdn's to prevent host poisioning attacks
 # https://docs.djangoproject.com/en/1.11/ref/settings/#allowed-hosts
 ALLOWED_HOSTS = ['*']
@@ -368,7 +366,7 @@
         'HOST': os.environ.get('DEIS_DATABASE_SERVICE_HOST', ''),
         'PORT': os.environ.get('DEIS_DATABASE_SERVICE_PORT', 5432),
         # https://docs.djangoproject.com/en/1.11/ref/databases/#persistent-connections
-        'CONN_MAX_AGE': 600,
+        'CONN_MAX_AGE': os.environ.get('CONN_MAX_AGE', 600),
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@`
`27`	`27`	`'security.W008'`
`28`	`28`	`]`
`29`	`29`
`30`		`-CONN_MAX_AGE = 60 * 3`
`31`		`-`
`32`	`30`	`# SECURITY: change this to allowed fqdn's to prevent host poisioning attacks`
`33`	`31`	`# https://docs.djangoproject.com/en/1.11/ref/settings/#allowed-hosts`
`34`	`32`	`ALLOWED_HOSTS = ['*']`
`@@ -368,7 +366,7 @@`
`368`	`366`	`'HOST': os.environ.get('DEIS_DATABASE_SERVICE_HOST', ''),`
`369`	`367`	`'PORT': os.environ.get('DEIS_DATABASE_SERVICE_PORT', 5432),`
`370`	`368`	`# https://docs.djangoproject.com/en/1.11/ref/databases/#persistent-connections`
`371`		`- 'CONN_MAX_AGE': 600,`
	`369`	`+ 'CONN_MAX_AGE': os.environ.get('CONN_MAX_AGE', 600),`
`372`	`370`	`}`
`373`	`371`	`}`
`374`	`372`