Merge pull request #483 from wking/gunicorn-opts

dmp42 · dmp42 · commit 9124375c560a · 2014-07-25T15:56:36.000+02:00
docker_registry.run: Restore GUNICORN_OPTS functionality
diff --git a/docker_registry/run.py b/docker_registry/run.py
@@ -77,6 +77,7 @@ def run_gunicorn():
         '-t', env.source('GUNICORN_SILENT_TIMEOUT'),
         '-w', env.source('GUNICORN_WORKERS'),
         '-b', address,
+    ] + env.source('GUNICORN_OPTS') + [
         'docker_registry.wsgi:application'
     ]
 
diff --git a/docker_registry/server/env.py b/docker_registry/server/env.py
@@ -13,7 +13,8 @@
     'GUNICORN_GRACEFUL_TIMEOUT': '3600',
     'GUNICORN_SILENT_TIMEOUT': '3600',
     'GUNICORN_ACCESS_LOG_FILE': '"-"',
-    'GUNICORN_ERROR_LOG_FILE': '"-"'
+    'GUNICORN_ERROR_LOG_FILE': '"-"',
+    'GUNICORN_OPTS': '[]',
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ def run_gunicorn():`
`77`	`77`	`'-t', env.source('GUNICORN_SILENT_TIMEOUT'),`
`78`	`78`	`'-w', env.source('GUNICORN_WORKERS'),`
`79`	`79`	`'-b', address,`
	`80`	`+ ] + env.source('GUNICORN_OPTS') + [`
`80`	`81`	`'docker_registry.wsgi:application'`
`81`	`82`	`]`
`82`	`83`