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

Problem: default config uses env vars

Browse Source 
Solution: this is managed by the function
`bigchaindb.config_utils::env_config`, we don't need to call
`os.environ.get` for each value.
This commit is contained in:
vrde 2018-02-14 10:22:10 +01:00 committed by Sylvain Bellemare
parent bf2a1c6a60
commit 254035150d
1 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
bigchaindb/__init__.py
View File

@ -1,6 +1,5 @@
import copy import copy
import logging import logging
import os
from bigchaindb.log.configs import SUBSCRIBER_LOGGING_CONFIG as log_config from bigchaindb.log.configs import SUBSCRIBER_LOGGING_CONFIG as log_config
@ -10,9 +9,9 @@ from bigchaindb.log.configs import SUBSCRIBER_LOGGING_CONFIG as log_config
_base_database_rethinkdb = { _base_database_rethinkdb = {
'host': os.environ.get('BIGCHAINDB_DATABASE_HOST', 'localhost'), 'host': 'localhost',
'port': int(os.environ.get('BIGCHAINDB_DATABASE_PORT', 28015)), 'port': 28015,
'name': os.environ.get('BIGCHAINDB_DATABASE_NAME', 'bigchain'), 'name': 'bigchain',
} }
# The following variable is used by `bigchaindb configure` to # The following variable is used by `bigchaindb configure` to
@ -27,53 +26,53 @@ _database_keys_map = {
} }
_base_database_localmongodb = { _base_database_localmongodb = {
'host': os.environ.get('BIGCHAINDB_DATABASE_HOST', 'localhost'), 'host': 'localhost',
'port': int(os.environ.get('BIGCHAINDB_DATABASE_PORT', 27017)), 'port': 27017,
'name': os.environ.get('BIGCHAINDB_DATABASE_NAME', 'bigchain'), 'name': 'bigchain',
'replicaset': os.environ.get('BIGCHAINDB_DATABASE_REPLICASET'), 'replicaset': None,
'login': os.environ.get('BIGCHAINDB_DATABASE_LOGIN'), 'login': None,
'password': os.environ.get('BIGCHAINDB_DATABASE_PASSWORD') 'password': None,
} }
_base_database_mongodb = { _base_database_mongodb = {
'host': os.environ.get('BIGCHAINDB_DATABASE_HOST', 'localhost'), 'host': 'localhost',
'port': int(os.environ.get('BIGCHAINDB_DATABASE_PORT', 27017)), 'port': 27017,
'name': os.environ.get('BIGCHAINDB_DATABASE_NAME', 'bigchain'), 'name': 'bigchain',
'replicaset': os.environ.get('BIGCHAINDB_DATABASE_REPLICASET', 'bigchain-rs'), 'replicaset': 'bigchain-rs',
'login': os.environ.get('BIGCHAINDB_DATABASE_LOGIN'), 'login': None,
'password': os.environ.get('BIGCHAINDB_DATABASE_PASSWORD') 'password': None,
} }
_database_rethinkdb = { _database_rethinkdb = {
'backend': os.environ.get('BIGCHAINDB_DATABASE_BACKEND', 'rethinkdb'), 'backend': 'rethinkdb',
'connection_timeout': 5000, 'connection_timeout': 5000,
'max_tries': 3, 'max_tries': 3,
} }
_database_rethinkdb.update(_base_database_rethinkdb) _database_rethinkdb.update(_base_database_rethinkdb)
_database_mongodb = { _database_mongodb = {
'backend': os.environ.get('BIGCHAINDB_DATABASE_BACKEND', 'mongodb'), 'backend': 'mongodb',
'connection_timeout': 5000, 'connection_timeout': 5000,
'max_tries': 3, 'max_tries': 3,
'ssl': bool(os.environ.get('BIGCHAINDB_DATABASE_SSL', False)), 'ssl': False,
'ca_cert': os.environ.get('BIGCHAINDB_DATABASE_CA_CERT'), 'ca_cert': None,
'certfile': os.environ.get('BIGCHAINDB_DATABASE_CERTFILE'), 'certfile': None,
'keyfile': os.environ.get('BIGCHAINDB_DATABASE_KEYFILE'), 'keyfile': None,
'keyfile_passphrase': os.environ.get('BIGCHAINDB_DATABASE_KEYFILE_PASSPHRASE'), 'keyfile_passphrase': None,
'crlfile': os.environ.get('BIGCHAINDB_DATABASE_CRLFILE') 'crlfile': None,
} }
_database_mongodb.update(_base_database_mongodb) _database_mongodb.update(_base_database_mongodb)
_database_localmongodb = { _database_localmongodb = {
'backend': os.environ.get('BIGCHAINDB_DATABASE_BACKEND', 'localmongodb'), 'backend': 'localmongodb',
'connection_timeout': 5000, 'connection_timeout': 5000,
'max_tries': 3, 'max_tries': 3,
'ssl': bool(os.environ.get('BIGCHAINDB_DATABASE_SSL', False)), 'ssl': False,
'ca_cert': os.environ.get('BIGCHAINDB_DATABASE_CA_CERT'), 'ca_cert': None,
'certfile': os.environ.get('BIGCHAINDB_DATABASE_CERTFILE'), 'certfile': None,
'keyfile': os.environ.get('BIGCHAINDB_DATABASE_KEYFILE'), 'keyfile': None,
'keyfile_passphrase': os.environ.get('BIGCHAINDB_DATABASE_KEYFILE_PASSPHRASE'), 'keyfile_passphrase': None,
'crlfile': os.environ.get('BIGCHAINDB_DATABASE_CRLFILE') 'crlfile': None,
} }
_database_localmongodb.update(_base_database_localmongodb) _database_localmongodb.update(_base_database_localmongodb)
@ -87,22 +86,20 @@ config = {
'server': { 'server': {
# Note: this section supports all the Gunicorn settings: # Note: this section supports all the Gunicorn settings:
# - http://docs.gunicorn.org/en/stable/settings.html # - http://docs.gunicorn.org/en/stable/settings.html
'bind': os.environ.get('BIGCHAINDB_SERVER_BIND') or 'localhost:9984', 'bind': 'localhost:9984',
'loglevel': logging.getLevelName( 'loglevel': logging.getLevelName(
log_config['handlers']['console']['level']).lower(), log_config['handlers']['console']['level']).lower(),
'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', 'scheme': 'ws',
'host': os.environ.get('BIGCHAINDB_WSSERVER_HOST') or 'localhost', 'host': 'localhost',
'port': int(os.environ.get('BIGCHAINDB_WSSERVER_PORT', 9985)), 'port': 9985,
'advertised_scheme': os.environ.get('BIGCHAINDB_WSSERVER_ADVERTISED_SCHEME') or 'ws', 'advertised_scheme': 'ws',
'advertised_host': os.environ.get('BIGCHAINDB_WSSERVER_ADVERTISED_HOST') or 'localhost', 'advertised_host': 'localhost',
'advertised_port': int(os.environ.get('BIGCHAINDB_WSSERVER_ADVERTISED_PORT', 9985)), 'advertised_port': 9985,
}, },
'database': _database_map[ 'database': _database_map['localmongodb'],
os.environ.get('BIGCHAINDB_DATABASE_BACKEND', 'rethinkdb')
],
'keypair': { 'keypair': {
'public': None, 'public': None,
'private': None, 'private': None,