bigchaindb
/
bigchaindb
mirror of https://github.com/bigchaindb/bigchaindb.git
1
0
Fork 0
Code Releases Activity

Problem: new env vars are not managed by the conf 

Solution: add `BIGCHAINDB_` to new tendermint vars. Reference:
https://github.com/bigchaindb/bigchaindb/pull/2039#discussion_r167880795
This commit is contained in:
vrde 2018-02-14 10:44:44 +01:00 committed by Sylvain Bellemare
parent 6e3f9e8f54
commit 55073366ec
8 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigchaindb/tendermint/event_stream.py
View File

@ -11,8 +11,8 @@ from bigchaindb.events import EventTypes, Event
from bigchaindb.tendermint.utils import decode_transaction_base64
HOST = getenv('TENDERMINT_HOST', 'localhost')
PORT = int(getenv('TENDERMINT_PORT', 46657))
HOST = getenv('BIGCHAINDB_TENDERMINT_HOST', 'localhost')
PORT = int(getenv('BIGCHAINDB_TENDERMINT_PORT', 46657))
URL = f'ws://{HOST}:{PORT}/websocket'
logger = logging.getLogger(__name__)

9
bigchaindb/tendermint/lib.py
View File

@ -17,9 +17,12 @@ from bigchaindb import exceptions as core_exceptions
logger = logging.getLogger(__name__)
TENDERMINT_HOST = getenv('TENDERMINT_HOST', 'localhost')
TENDERMINT_PORT = getenv('TENDERMINT_PORT', '46657')
ENDPOINT = 'http://{}:{}/'.format(TENDERMINT_HOST, TENDERMINT_PORT)
BIGCHAINDB_TENDERMINT_HOST = getenv('BIGCHAINDB_TENDERMINT_HOST',
'localhost')
BIGCHAINDB_TENDERMINT_PORT = getenv('BIGCHAINDB_TENDERMINT_PORT',
'46657')
ENDPOINT = 'http://{}:{}/'.format(BIGCHAINDB_TENDERMINT_HOST,
BIGCHAINDB_TENDERMINT_PORT)
MODE_LIST = ('broadcast_tx_async',
'broadcast_tx_sync',
'broadcast_tx_commit')

2
compose/bigchaindb-server/Dockerfile
View File

@ -22,7 +22,7 @@ ENV BIGCHAINDB_WSSERVER_ADVERTISED_HOST 0.0.0.0
ENV BIGCHAINDB_WSSERVER_ADVERTISED_SCHEME ws
ENV BIGCHAINDB_START_TENDERMINT 0
ENV TENDERMINT_PORT 46657
ENV BIGCHAINDB_TENDERMINT_PORT 46657
RUN mkdir -p /usr/src/app

2
compose/travis/Dockerfile
View File

@ -20,7 +20,7 @@ ENV BIGCHAINDB_WSSERVER_ADVERTISED_HOST 0.0.0.0
ENV BIGCHAINDB_WSSERVER_ADVERTISED_SCHEME ws
ENV BIGCHAINDB_START_TENDERMINT 0
ENV TENDERMINT_PORT 46657
ENV BIGCHAINDB_TENDERMINT_PORT 46657
RUN mkdir -p /usr/src/app
COPY . /usr/src/app/

8
docker-compose.network.yml
View File

@ -27,7 +27,7 @@ services:
environment:
BIGCHAINDB_DATABASE_BACKEND: localmongodb
BIGCHAINDB_DATABASE_HOST: mdb-one
TENDERMINT_HOST: tendermint-one
BIGCHAINDB_TENDERMINT_HOST: tendermint-one
ports:
- "9984"
command: bigchaindb -l DEBUG start
@ -64,7 +64,7 @@ services:
environment:
BIGCHAINDB_DATABASE_BACKEND: localmongodb
BIGCHAINDB_DATABASE_HOST: mdb-two
TENDERMINT_HOST: tendermint-two
BIGCHAINDB_TENDERMINT_HOST: tendermint-two
ports:
- "9984"
command: bigchaindb -l DEBUG start
@ -101,7 +101,7 @@ services:
environment:
BIGCHAINDB_DATABASE_BACKEND: localmongodb
BIGCHAINDB_DATABASE_HOST: mdb-three
TENDERMINT_HOST: tendermint-three
BIGCHAINDB_TENDERMINT_HOST: tendermint-three
ports:
- "9984"
command: bigchaindb -l DEBUG start
@ -138,7 +138,7 @@ services:
environment:
BIGCHAINDB_DATABASE_BACKEND: localmongodb
BIGCHAINDB_DATABASE_HOST: mdb-four
TENDERMINT_HOST: tendermint-four
BIGCHAINDB_TENDERMINT_HOST: tendermint-four
ports:
- "9984"
command: bigchaindb -l DEBUG start

4
docker-compose.tendermint.yml
View File

@ -30,8 +30,8 @@ services:
BIGCHAINDB_SERVER_BIND: 0.0.0.0:9984
BIGCHAINDB_WSSERVER_HOST: 0.0.0.0
BIGCHAINDB_START_TENDERMINT: 0
TENDERMINT_HOST: tendermint
TENDERMINT_PORT: 46657
BIGCHAINDB_TENDERMINT_HOST: tendermint
BIGCHAINDB_TENDERMINT_PORT: 46657
ports:
- "9984"
- "46658"

4
docker-compose.travis.yml
View File

@ -22,8 +22,8 @@ services:
BIGCHAINDB_SERVER_BIND: 0.0.0.0:9984
BIGCHAINDB_WSSERVER_HOST: 0.0.0.0
BIGCHAINDB_START_TENDERMINT: 0
TENDERMINT_HOST: tendermint
TENDERMINT_PORT: 46657
BIGCHAINDB_TENDERMINT_HOST: tendermint
BIGCHAINDB_TENDERMINT_PORT: 46657
command: bigchaindb start
tendermint:
image: tendermint/tendermint:0.13

4
tests/conftest.py
View File

@ -501,12 +501,12 @@ def db_context(db_config, db_host, db_port, db_name, db_conn):
@pytest.fixture
def tendermint_host():
return os.getenv('TENDERMINT_HOST', 'localhost')
return os.getenv('BIGCHAINDB_TENDERMINT_HOST', 'localhost')
@pytest.fixture
def tendermint_port():
return int(os.getenv('TENDERMINT_PORT', 46657))
return int(os.getenv('BIGCHAINDB_TENDERMINT_PORT', 46657))
@pytest.fixture