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

use uri

Browse Source
This commit is contained in:
martin donadieu 2019-12-04 12:09:03 +01:00
parent 7d8d8ec685
commit b38e938cde
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bigchaindb/backend/connection.py
View File

@ -18,7 +18,7 @@ BACKENDS = {
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def connect(backend=None, host=None, port=None, name=None, max_tries=None, def connect(backend=None, uri=None, host=None, port=None, name=None, max_tries=None,
connection_timeout=None, replicaset=None, ssl=None, login=None, password=None, connection_timeout=None, replicaset=None, ssl=None, login=None, password=None,
ca_cert=None, certfile=None, keyfile=None, keyfile_passphrase=None, ca_cert=None, certfile=None, keyfile=None, keyfile_passphrase=None,
crlfile=None): crlfile=None):
@ -48,6 +48,7 @@ def connect(backend=None, host=None, port=None, name=None, max_tries=None,
""" """
backend = backend or get_bigchaindb_config_value_or_key_error('backend') backend = backend or get_bigchaindb_config_value_or_key_error('backend')
uri = uri or get_bigchaindb_config_value_or_key_error('uri')
host = host or get_bigchaindb_config_value_or_key_error('host') host = host or get_bigchaindb_config_value_or_key_error('host')
port = port or get_bigchaindb_config_value_or_key_error('port') port = port or get_bigchaindb_config_value_or_key_error('port')
dbname = name or get_bigchaindb_config_value_or_key_error('name') dbname = name or get_bigchaindb_config_value_or_key_error('name')
@ -94,7 +95,7 @@ class Connection:
from and implements this class. from and implements this class.
""" """
def __init__(self, host=None, port=None, dbname=None, def __init__(self, host=None, uri=None, port=None, dbname=None,
connection_timeout=None, max_tries=None, connection_timeout=None, max_tries=None,
**kwargs): **kwargs):
"""Create a new :class:`~.Connection` instance. """Create a new :class:`~.Connection` instance.
@ -114,6 +115,7 @@ class Connection:
dbconf = bigchaindb.config['database'] dbconf = bigchaindb.config['database']
self.uri = uri or dbconf['uri']
self.host = host or dbconf['host'] self.host = host or dbconf['host']
self.port = port or dbconf['port'] self.port = port or dbconf['port']
self.dbname = dbname or dbconf['name'] self.dbname = dbname or dbconf['name']
@ -159,9 +161,9 @@ class Connection:
try: try:
self._conn = self._connect() self._conn = self._connect()
except ConnectionError as exc: except ConnectionError as exc:
logger.warning('Attempt %s/%s. Connection to %s:%s failed after %sms.', logger.warning('Attempt %s/%s. Connection to %s:%s failed after %sms. %s',
attempt, self.max_tries if self.max_tries != 0 else '∞', attempt, self.max_tries if self.max_tries != 0 else '∞',
self.host, self.port, self.connection_timeout) self.host, self.port, self.connection_timeout, self.uri or '')
if attempt == self.max_tries: if attempt == self.max_tries:
logger.critical('Cannot connect to the Database. Giving up.') logger.critical('Cannot connect to the Database. Giving up.')
raise ConnectionError() from exc raise ConnectionError() from exc

6
bigchaindb/backend/localmongodb/connection.py
View File

@ -92,7 +92,11 @@ class LocalMongoDBConnection(Connection):
# `ConnectionFailure`. # `ConnectionFailure`.
# The presence of ca_cert, certfile, keyfile, crlfile implies the # The presence of ca_cert, certfile, keyfile, crlfile implies the
# use of certificates for TLS connectivity. # use of certificates for TLS connectivity.
if self.ca_cert is None or self.certfile is None or \ if self.uri is not None:
client = pymongo.MongoClient(self.uri,
serverSelectionTimeoutMS=self.connection_timeout,
**MONGO_OPTS)
elif self.ca_cert is None or self.certfile is None or \
self.keyfile is None or self.crlfile is None: self.keyfile is None or self.crlfile is None:
client = pymongo.MongoClient(self.host, client = pymongo.MongoClient(self.host,
self.port, self.port,