Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow scheme configuration for ws-server

Browse Source
This commit is contained in:
tim 2017-06-14 13:49:47 +02:00
parent 673062f892
commit bd0d79d399
7 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -13,5 +13,6 @@ WORKDIR /data
ENV BIGCHAINDB_CONFIG_PATH /data/.bigchaindb ENV BIGCHAINDB_CONFIG_PATH /data/.bigchaindb
ENV BIGCHAINDB_SERVER_BIND 0.0.0.0:9984 ENV BIGCHAINDB_SERVER_BIND 0.0.0.0:9984
ENV BIGCHAINDB_WSSERVER_HOST 0.0.0.0 ENV BIGCHAINDB_WSSERVER_HOST 0.0.0.0
ENV BIGCHAINDB_WSSERVER_SCHEME ws
ENTRYPOINT ["bigchaindb"] ENTRYPOINT ["bigchaindb"]
CMD ["start"] CMD ["start"]

1
Dockerfile-dev
View File

@ -9,6 +9,7 @@ RUN apt-get update \
ENV BIGCHAINDB_SERVER_BIND 0.0.0.0:9984 ENV BIGCHAINDB_SERVER_BIND 0.0.0.0:9984
ENV BIGCHAINDB_WSSERVER_HOST 0.0.0.0 ENV BIGCHAINDB_WSSERVER_HOST 0.0.0.0
ENV BIGCHAINDB_WSSERVER_SCHEME ws
ARG backend ARG backend

1
bigchaindb/__init__.py
View File

@ -69,6 +69,7 @@ config = {
'workers': None, # if none, the value will be cpu_count * 2 + 1 'workers': None, # if none, the value will be cpu_count * 2 + 1
}, },
'wsserver': { 'wsserver': {
'scheme': os.environ.get('BIGCHAINDB_WSSERVER_SCHEME') or 'ws',
'host': os.environ.get('BIGCHAINDB_WSSERVER_HOST') or 'localhost', 'host': os.environ.get('BIGCHAINDB_WSSERVER_HOST') or 'localhost',
'port': int(os.environ.get('BIGCHAINDB_WSSERVER_PORT', 9985)), 'port': int(os.environ.get('BIGCHAINDB_WSSERVER_PORT', 9985)),
}, },

2
bigchaindb/commands/bigchaindb.py
View File

@ -96,7 +96,7 @@ def run_configure(args, skip_if_exists=False):
val = conf['server'][key] val = conf['server'][key]
conf['server'][key] = input_on_stderr('API Server {}? (default `{}`): '.format(key, val), val) conf['server'][key] = input_on_stderr('API Server {}? (default `{}`): '.format(key, val), val)
for key in ('host', 'port'): for key in ('scheme', 'host', 'port'):
val = conf['wsserver'][key] val = conf['wsserver'][key]
conf['wsserver'][key] = input_on_stderr('WebSocket Server {}? (default `{}`): '.format(key, val), val) conf['wsserver'][key] = input_on_stderr('WebSocket Server {}? (default `{}`): '.format(key, val), val)

10
bigchaindb/web/views/base.py
View File

@ -3,7 +3,7 @@ Common classes and methods for API handlers
""" """
import logging import logging
from flask import jsonify, request from flask import jsonify
from bigchaindb import config from bigchaindb import config
@ -25,7 +25,7 @@ def base_ws_uri():
"""Base websocket uri.""" """Base websocket uri."""
# TODO Revisit as this is a workaround to address issue # TODO Revisit as this is a workaround to address issue
# https://github.com/bigchaindb/bigchaindb/issues/1465. # https://github.com/bigchaindb/bigchaindb/issues/1465.
# NOTE: This is now only for the WS API. Env-variable should be renamed to scheme = config['wsserver']['scheme']
# e.g. WS_HOST or WEBSOCKET_HOST host = config['wsserver']['host']
host = request.environ['HTTP_HOST'].split(':')[0] port = config['wsserver']['port']
return 'ws://{}:{}'.format(host, config['wsserver']['port']) return '{}://{}:{}'.format(scheme, host, port)

1
docs/server/source/server-reference/configuration.md
View File

@ -22,6 +22,7 @@ For convenience, here's a list of all the relevant environment variables (docume
`BIGCHAINDB_SERVER_LOGLEVEL`<br> `BIGCHAINDB_SERVER_LOGLEVEL`<br>
`BIGCHAINDB_SERVER_WORKERS`<br> `BIGCHAINDB_SERVER_WORKERS`<br>
`BIGCHAINDB_SERVER_THREADS`<br> `BIGCHAINDB_SERVER_THREADS`<br>
`BIGCHAINDB_WSSERVER_SCHEME`<br>
`BIGCHAINDB_WSSERVER_HOST`<br> `BIGCHAINDB_WSSERVER_HOST`<br>
`BIGCHAINDB_WSSERVER_PORT`<br> `BIGCHAINDB_WSSERVER_PORT`<br>
`BIGCHAINDB_CONFIG_PATH`<br> `BIGCHAINDB_CONFIG_PATH`<br>

4
tests/test_config_utils.py
View File

@ -147,6 +147,7 @@ def test_autoconfigure_read_both_from_file_and_env(monkeypatch, request, certs_d
DATABASE_PORT = 4242 DATABASE_PORT = 4242
DATABASE_BACKEND = request.config.getoption('--database-backend') DATABASE_BACKEND = request.config.getoption('--database-backend')
SERVER_BIND = '1.2.3.4:56' SERVER_BIND = '1.2.3.4:56'
WSSERVER_SCHEME = 'ws'
WSSERVER_HOST = '1.2.3.4' WSSERVER_HOST = '1.2.3.4'
WSSERVER_PORT = 57 WSSERVER_PORT = 57
KEYRING = 'pubkey_0:pubkey_1:pubkey_2' KEYRING = 'pubkey_0:pubkey_1:pubkey_2'
@ -169,6 +170,7 @@ def test_autoconfigure_read_both_from_file_and_env(monkeypatch, request, certs_d
'BIGCHAINDB_DATABASE_PORT': str(DATABASE_PORT), 'BIGCHAINDB_DATABASE_PORT': str(DATABASE_PORT),
'BIGCHAINDB_DATABASE_BACKEND': 'mongodb', 'BIGCHAINDB_DATABASE_BACKEND': 'mongodb',
'BIGCHAINDB_SERVER_BIND': SERVER_BIND, 'BIGCHAINDB_SERVER_BIND': SERVER_BIND,
'BIGCHAINDB_WSSERVER_SCHEME': WSSERVER_SCHEME,
'BIGCHAINDB_WSSERVER_HOST': WSSERVER_HOST, 'BIGCHAINDB_WSSERVER_HOST': WSSERVER_HOST,
'BIGCHAINDB_WSSERVER_PORT': WSSERVER_PORT, 'BIGCHAINDB_WSSERVER_PORT': WSSERVER_PORT,
'BIGCHAINDB_KEYRING': KEYRING, 'BIGCHAINDB_KEYRING': KEYRING,
@ -183,6 +185,7 @@ def test_autoconfigure_read_both_from_file_and_env(monkeypatch, request, certs_d
'BIGCHAINDB_DATABASE_PORT': str(DATABASE_PORT), 'BIGCHAINDB_DATABASE_PORT': str(DATABASE_PORT),
'BIGCHAINDB_DATABASE_BACKEND': DATABASE_BACKEND, 'BIGCHAINDB_DATABASE_BACKEND': DATABASE_BACKEND,
'BIGCHAINDB_SERVER_BIND': SERVER_BIND, 'BIGCHAINDB_SERVER_BIND': SERVER_BIND,
'BIGCHAINDB_WSSERVER_SCHEME': WSSERVER_SCHEME,
'BIGCHAINDB_WSSERVER_HOST': WSSERVER_HOST, 'BIGCHAINDB_WSSERVER_HOST': WSSERVER_HOST,
'BIGCHAINDB_WSSERVER_PORT': WSSERVER_PORT, 'BIGCHAINDB_WSSERVER_PORT': WSSERVER_PORT,
'BIGCHAINDB_KEYRING': KEYRING, 'BIGCHAINDB_KEYRING': KEYRING,
@ -255,6 +258,7 @@ def test_autoconfigure_read_both_from_file_and_env(monkeypatch, request, certs_d
'workers': None, 'workers': None,
}, },
'wsserver': { 'wsserver': {
'scheme': WSSERVER_SCHEME,
'host': WSSERVER_HOST, 'host': WSSERVER_HOST,
'port': WSSERVER_PORT, 'port': WSSERVER_PORT,
}, },