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

Add env variables to default config

Browse Source
This commit is contained in:
vrde 2016-04-26 03:24:56 +02:00
parent c3ad343e77
commit f9c609ff0d
No known key found for this signature in database
GPG Key ID: 6581C7C39B3D397D
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bigchaindb/commands/bigchain.py
View File

@ -52,6 +52,8 @@ def run_configure(args, skip_if_exists=False):
skip_if_exists (bool): skip the function if a config file already exists skip_if_exists (bool): skip the function if a config file already exists
""" """
config_path = args.config or bigchaindb.config_utils.CONFIG_DEFAULT_PATH config_path = args.config or bigchaindb.config_utils.CONFIG_DEFAULT_PATH
bigchaindb.config_utils.autoconfigure(filename=False, force=True)
config_file_exists = False config_file_exists = False
# if the config path is `-` then it's stdout # if the config path is `-` then it's stdout
@ -68,7 +70,8 @@ def run_configure(args, skip_if_exists=False):
return return
# Patch the default configuration with the new values # Patch the default configuration with the new values
conf = copy.deepcopy(bigchaindb._config) conf = copy.deepcopy(bigchaindb.config)
del conf['CONFIGURED']
print('Generating keypair', file=sys.stderr) print('Generating keypair', file=sys.stderr)
conf['keypair']['private'], conf['keypair']['public'] = \ conf['keypair']['private'], conf['keypair']['public'] = \

6
bigchaindb/config_utils.py
View File

@ -91,7 +91,11 @@ def file_config(filename=None):
file at CONFIG_DEFAULT_PATH, if filename == None) file at CONFIG_DEFAULT_PATH, if filename == None)
""" """
logger.debug('On entry into file_config(), filename = {}'.format(filename)) logger.debug('On entry into file_config(), filename = {}'.format(filename))
if not filename:
if filename is False:
return {}
if filename is None:
filename = CONFIG_DEFAULT_PATH filename = CONFIG_DEFAULT_PATH
logger.debug('file_config() will try to open `{}`'.format(filename)) logger.debug('file_config() will try to open `{}`'.format(filename))

2
setup.py
View File

@ -73,7 +73,7 @@ setup(
] ]
}, },
install_requires=[ install_requires=[
'rethinkdb==2.2.0.post4', 'rethinkdb==2.3.0',
'pysha3==0.3', 'pysha3==0.3',
'pytz==2015.7', 'pytz==2015.7',
'cryptoconditions==0.1.6', 'cryptoconditions==0.1.6',

4
tests/test_commands.py
View File

@ -186,7 +186,7 @@ def test_run_configure_when_config_does_not_exist(monkeypatch,
mock_bigchaindb_backup_config): mock_bigchaindb_backup_config):
from bigchaindb.commands.bigchain import run_configure from bigchaindb.commands.bigchain import run_configure
monkeypatch.setattr('os.path.exists', lambda path: False) monkeypatch.setattr('os.path.exists', lambda path: False)
monkeypatch.setattr('builtins.input', lambda question: '\n') monkeypatch.setattr('builtins.input', lambda: '\n')
args = Namespace(config='foo', yes=True) args = Namespace(config='foo', yes=True)
return_value = run_configure(args) return_value = run_configure(args)
assert return_value is None assert return_value is None
@ -202,7 +202,7 @@ def test_run_configure_when_config_does_exist(monkeypatch,
from bigchaindb.commands.bigchain import run_configure from bigchaindb.commands.bigchain import run_configure
monkeypatch.setattr('os.path.exists', lambda path: True) monkeypatch.setattr('os.path.exists', lambda path: True)
monkeypatch.setattr('builtins.input', lambda question: '\n') monkeypatch.setattr('builtins.input', lambda: '\n')
monkeypatch.setattr('bigchaindb.config_utils.write_config', mock_write_config) monkeypatch.setattr('bigchaindb.config_utils.write_config', mock_write_config)
args = Namespace(config='foo', yes=None) args = Namespace(config='foo', yes=None)