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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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