From 786635df4a13b922079590ad6d1b9f03f73ba39c Mon Sep 17 00:00:00 2001
From: Brett Sun <qisheng.brett.sun@gmail.com>
Date: Tue, 15 Nov 2016 17:41:35 +0100
Subject: [PATCH] Explicitly pass settings for flask into flask app factory
 (#750)

---
 bigchaindb/web/server.py | 12 ++++++++----
 tests/web/conftest.py    |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bigchaindb/web/server.py b/bigchaindb/web/server.py
index 50ef4cc3..1756fffe 100644
--- a/bigchaindb/web/server.py
+++ b/bigchaindb/web/server.py
@@ -49,19 +49,22 @@ class StandaloneApplication(gunicorn.app.base.BaseApplication):
         return self.application
 
 
-def create_app(settings):
+def create_app(*, debug=False, threads=4):
     """Return an instance of the Flask application.
 
     Args:
         debug (bool): a flag to activate the debug mode for the app
             (default: False).
+        threads (int): number of threads to use
+    Return:
+        an instance of the Flask application.
     """
 
     app = Flask(__name__)
 
-    app.debug = settings.get('debug', False)
+    app.debug = debug
 
-    app.config['bigchain_pool'] = util.pool(Bigchain, size=settings.get('threads', 4))
+    app.config['bigchain_pool'] = util.pool(Bigchain, size=threads)
     app.config['monitor'] = Monitor()
 
     app.register_blueprint(info_views, url_prefix='/')
@@ -88,6 +91,7 @@ def create_server(settings):
     if not settings.get('threads'):
         settings['threads'] = (multiprocessing.cpu_count() * 2) + 1
 
-    app = create_app(settings)
+    app = create_app(debug=settings.get('debug', False),
+                     threads=settings['threads'])
     standalone = StandaloneApplication(app, settings)
     return standalone
diff --git a/tests/web/conftest.py b/tests/web/conftest.py
index db5583e7..95874f5c 100644
--- a/tests/web/conftest.py
+++ b/tests/web/conftest.py
@@ -25,7 +25,7 @@ def app(request, node_config):
     restore_config(request, node_config)
 
     from bigchaindb.web import server
-    app = server.create_app({'debug': True})
+    app = server.create_app(debug=True)
     return app