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

Revert "Add ssl, login, and passwd to configure command"

Browse Source 
This reverts commit 699e615d47bb6b24f4d373c8edfd3a84d4b6e0c1.
This commit is contained in:
vrde 2017-03-28 15:01:10 +02:00
parent 699e615d47
commit 047108046a
No known key found for this signature in database
GPG Key ID: 6581C7C39B3D397D
3 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bigchaindb/__init__.py
View File

@ -5,48 +5,24 @@ import os
# PORT_NUMBER = reduce(lambda x, y: x * y, map(ord, 'BigchainDB')) % 2**16 # PORT_NUMBER = reduce(lambda x, y: x * y, map(ord, 'BigchainDB')) % 2**16
# basically, the port number is 9984 # basically, the port number is 9984
_database_rethinkdb = {
_base_database_rethinkdb = { 'backend': os.environ.get('BIGCHAINDB_DATABASE_BACKEND', 'rethinkdb'),
'host': os.environ.get('BIGCHAINDB_DATABASE_HOST', 'localhost'), 'host': os.environ.get('BIGCHAINDB_DATABASE_HOST', 'localhost'),
'port': int(os.environ.get('BIGCHAINDB_DATABASE_PORT', 28015)), 'port': int(os.environ.get('BIGCHAINDB_DATABASE_PORT', 28015)),
'name': os.environ.get('BIGCHAINDB_DATABASE_NAME', 'bigchain'), 'name': os.environ.get('BIGCHAINDB_DATABASE_NAME', 'bigchain'),
'connection_timeout': 5000,
'max_tries': 3,
} }
# This might sound excessive, but having an order on the keys will _database_mongodb = {
# stress users (and us) less. 'backend': os.environ.get('BIGCHAINDB_DATABASE_BACKEND', 'mongodb'),
_base_database_rethinkdb_keys = ('host', 'port', 'name')
_base_database_mongodb = {
'host': os.environ.get('BIGCHAINDB_DATABASE_HOST', 'localhost'), 'host': os.environ.get('BIGCHAINDB_DATABASE_HOST', 'localhost'),
'port': int(os.environ.get('BIGCHAINDB_DATABASE_PORT', 27017)), 'port': int(os.environ.get('BIGCHAINDB_DATABASE_PORT', 27017)),
'name': os.environ.get('BIGCHAINDB_DATABASE_NAME', 'bigchain'), 'name': os.environ.get('BIGCHAINDB_DATABASE_NAME', 'bigchain'),
'replicaset': os.environ.get('BIGCHAINDB_DATABASE_REPLICASET', 'bigchain-rs'), 'replicaset': os.environ.get('BIGCHAINDB_DATABASE_REPLICASET', 'bigchain-rs'),
'ssl': bool(os.environ.get('BIGCHAINDB_DATABASE_SSL', False)),
'login': os.environ.get('BIGCHAINDB_DATABASE_LOGIN'),
'password': os.environ.get('BIGCHAINDB_DATABASE_PASSWORD')
}
_base_database_mongodb_keys = ('host', 'port', 'name', 'replicaset',
'ssl', 'login', 'password')
_database_rethinkdb = {
'backend': os.environ.get('BIGCHAINDB_DATABASE_BACKEND', 'rethinkdb'),
'connection_timeout': 5000, 'connection_timeout': 5000,
'max_tries': 3, 'max_tries': 3,
} }
_database_rethinkdb.update(_base_database_rethinkdb)
_database_mongodb = {
'backend': os.environ.get('BIGCHAINDB_DATABASE_BACKEND', 'mongodb'),
'connection_timeout': 5000,
'max_tries': 3,
}
_database_mongodb.update(_base_database_mongodb)
_database_keys_map = {
'mongodb': _base_database_mongodb_keys,
'rethinkdb': _base_database_rethinkdb_keys
}
_database_map = { _database_map = {
'mongodb': _database_mongodb, 'mongodb': _database_mongodb,

3
bigchaindb/commands/bigchain.py
View File

@ -90,7 +90,6 @@ def run_configure(args, skip_if_exists=False):
# select the correct config defaults based on the backend # select the correct config defaults based on the backend
print('Generating default configuration for backend {}' print('Generating default configuration for backend {}'
.format(args.backend), file=sys.stderr) .format(args.backend), file=sys.stderr)
database_keys = bigchaindb._database_keys_map[args.backend]
conf['database'] = bigchaindb._database_map[args.backend] conf['database'] = bigchaindb._database_map[args.backend]
if not args.yes: if not args.yes:
@ -100,7 +99,7 @@ def run_configure(args, skip_if_exists=False):
input_on_stderr('API Server {}? (default `{}`): '.format(key, val)) \ input_on_stderr('API Server {}? (default `{}`): '.format(key, val)) \
or val or val
for key in database_keys: for key in ('host', 'port', 'name'):
val = conf['database'][key] val = conf['database'][key]
conf['database'][key] = \ conf['database'][key] = \
input_on_stderr('Database {}? (default `{}`): '.format(key, val)) \ input_on_stderr('Database {}? (default `{}`): '.format(key, val)) \

12
tests/test_config_utils.py
View File

@ -19,15 +19,6 @@ def clean_config(monkeypatch, request):
monkeypatch.setattr('bigchaindb.config', original_config) monkeypatch.setattr('bigchaindb.config', original_config)
def test_ordered_keys_match_database_config():
import bigchaindb
assert set(bigchaindb._base_database_rethinkdb.keys()) ==\
set(bigchaindb._base_database_rethinkdb_keys)
assert set(bigchaindb._base_database_mongodb.keys()) ==\
set(bigchaindb._base_database_mongodb_keys)
def test_bigchain_instance_is_initialized_when_conf_provided(request): def test_bigchain_instance_is_initialized_when_conf_provided(request):
import bigchaindb import bigchaindb
from bigchaindb import config_utils from bigchaindb import config_utils
@ -190,9 +181,6 @@ def test_autoconfigure_read_both_from_file_and_env(monkeypatch, request):
'connection_timeout': 5000, 'connection_timeout': 5000,
'max_tries': 3, 'max_tries': 3,
'replicaset': 'bigchain-rs', 'replicaset': 'bigchain-rs',
'ssl': False,
'login': None,
'password': None
} }
database = {} database = {}