feat(controller): set CONN_MAX_AGE from env var

Kingdon Barrett · Kingdon Barrett · commit d584f52fa499 · 2018-08-25T14:09:32.000-04:00
diff --git a/rootfs/api/settings/production.py b/rootfs/api/settings/production.py
@@ -24,8 +24,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 = ['*']
@@ -354,7 +352,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
`@@ -24,8 +24,6 @@`
`24`	`24`	`'security.W008'`
`25`	`25`	`]`
`26`	`26`
`27`		`-CONN_MAX_AGE = 60 * 3`
`28`		`-`
`29`	`27`	`# SECURITY: change this to allowed fqdn's to prevent host poisioning attacks`
`30`	`28`	`# https://docs.djangoproject.com/en/1.11/ref/settings/#allowed-hosts`
`31`	`29`	`ALLOWED_HOSTS = ['*']`
`@@ -354,7 +352,7 @@`
`354`	`352`	`'HOST': os.environ.get('DEIS_DATABASE_SERVICE_HOST', ''),`
`355`	`353`	`'PORT': os.environ.get('DEIS_DATABASE_SERVICE_PORT', 5432),`
`356`	`354`	`# https://docs.djangoproject.com/en/1.11/ref/databases/#persistent-connections`
`357`		`- 'CONN_MAX_AGE': 600,`
	`355`	`+ 'CONN_MAX_AGE': os.environ.get('CONN_MAX_AGE', 600),`
`358`	`356`	`}`
`359`	`357`	`}`
`360`	`358`