From d260e16f117a2bfc75a0fc7f03b325e802978ba2 Mon Sep 17 00:00:00 2001
From: vrde <agranzot@gmail.com>
Date: Fri, 7 Apr 2017 10:51:00 +0200
Subject: [PATCH] Add configuration for websocket server

---
 bigchaindb/__init__.py             | 4 ++++
 bigchaindb/commands/bigchaindb.py  | 4 ++++
 bigchaindb/web/views/base.py       | 5 ++++-
 bigchaindb/web/websocket_server.py | 5 ++++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/bigchaindb/__init__.py b/bigchaindb/__init__.py
index 4c555e47..98e6b27b 100644
--- a/bigchaindb/__init__.py
+++ b/bigchaindb/__init__.py
@@ -59,6 +59,10 @@ config = {
         'workers': None,  # if none, the value will be cpu_count * 2 + 1
         'threads': None,  # if none, the value will be cpu_count * 2 + 1
     },
+    'wsserver': {
+        'host': os.environ.get('BIGCHAINDB_WSSERVER_HOST') or 'localhost',
+        'port': int(os.environ.get('BIGCHAINDB_WSSERVER_PORT', 9985)),
+    },
     'database': _database_map[
         os.environ.get('BIGCHAINDB_DATABASE_BACKEND', 'rethinkdb')
     ],
diff --git a/bigchaindb/commands/bigchaindb.py b/bigchaindb/commands/bigchaindb.py
index d4e37daa..a46019da 100644
--- a/bigchaindb/commands/bigchaindb.py
+++ b/bigchaindb/commands/bigchaindb.py
@@ -96,6 +96,10 @@ def run_configure(args, skip_if_exists=False):
             val = conf['server'][key]
             conf['server'][key] = input_on_stderr('API Server {}? (default `{}`): '.format(key, val), val)
 
+        for key in ('host', 'port'):
+            val = conf['wsserver'][key]
+            conf['wsserver'][key] = input_on_stderr('WebSocket Server {}? (default `{}`): '.format(key, val), val)
+
         for key in database_keys:
             val = conf['database'][key]
             conf['database'][key] = input_on_stderr('Database {}? (default `{}`): '.format(key, val), val)
diff --git a/bigchaindb/web/views/base.py b/bigchaindb/web/views/base.py
index 5ab409b0..7b12c5bb 100644
--- a/bigchaindb/web/views/base.py
+++ b/bigchaindb/web/views/base.py
@@ -5,6 +5,9 @@ import logging
 
 from flask import jsonify, request
 
+from bigchaindb import config
+
+
 logger = logging.getLogger(__name__)
 
 
@@ -25,4 +28,4 @@ def base_url():
 
 def base_ws_uri():
     """Base websocket uri."""
-    return 'ws://localhost:9985/'
+    return 'ws://{host}:{port}/'.format(**config['wsserver'])
diff --git a/bigchaindb/web/websocket_server.py b/bigchaindb/web/websocket_server.py
index dc320754..dad06b94 100644
--- a/bigchaindb/web/websocket_server.py
+++ b/bigchaindb/web/websocket_server.py
@@ -20,6 +20,7 @@ from uuid import uuid4
 import aiohttp
 from aiohttp import web
 
+from bigchaindb import config
 from bigchaindb.events import EventTypes
 
 
@@ -167,4 +168,6 @@ def start(sync_event_source, loop=None):
     bridge.start()
 
     app = init_app(event_source, loop=loop)
-    aiohttp.web.run_app(app, port=9985)
+    aiohttp.web.run_app(app,
+                        host=config['wsserver']['host'],
+                        port=config['wsserver']['port'])