Merge branch 'master' into events-api-first-cut

This commit is contained in:
vrde 2017-04-11 10:17:39 +02:00
commit 3758d458ce
No known key found for this signature in database
GPG Key ID: 6581C7C39B3D397D

View File

@ -22,7 +22,7 @@ class StandaloneApplication(gunicorn.app.base.BaseApplication):
- http://docs.gunicorn.org/en/latest/custom.html
"""
def __init__(self, app, options=None):
def __init__(self, app, *, options=None):
'''Initialize a new standalone application.
Args:
@ -32,7 +32,7 @@ class StandaloneApplication(gunicorn.app.base.BaseApplication):
'''
self.options = options or {}
self.application = app
super(StandaloneApplication, self).__init__()
super().__init__()
def load_config(self):
config = dict((key, value) for key, value in self.options.items()
@ -91,5 +91,5 @@ def create_server(settings):
settings['logger_class'] = 'bigchaindb.log.loggers.HttpServerLogger'
app = create_app(debug=settings.get('debug', False),
threads=settings['threads'])
standalone = StandaloneApplication(app, settings)
standalone = StandaloneApplication(app, options=settings)
return standalone