issue with password field

This commit is contained in:
andrei 2022-03-24 15:41:15 +02:00
parent 14830bd4b7
commit 8b8caa6ad7
6 changed files with 17 additions and 18 deletions

View File

@ -17,7 +17,6 @@ logger = logging.getLogger(__name__)
def Connection(host: str = None, port: int = None, login: str = None, password: str = None, backend: str = None,
**kwargs):
# TODO To add parser for **kwargs, when mongodb is used
backend = backend
if not backend and kwargs and kwargs["backend"]:
backend = kwargs["backend"]
@ -31,10 +30,11 @@ def Connection(host: str = None, port: int = None, login: str = None, password:
port = port or Config().get()['database']['port'] if not kwargs.get("port") else kwargs["port"]
login = login or Config().get()["database"]["login"] if not kwargs.get("login") else kwargs["login"]
password = password or Config().get()["database"]["password"]
if backend == "tarantool_db":
modulepath, _, class_name = BACKENDS[backend].rpartition('.')
Class = getattr(import_module(modulepath), class_name)
print("LOGIN " + str(login))
print("PASSWORD " + str(password))
return Class(host=host, port=port, user=login, password=password)
elif backend == "localmongodb":
modulepath, _, class_name = BACKENDS[backend].rpartition('.')

View File

@ -8,7 +8,7 @@
from functools import singledispatch
import logging
import planetmint
from planetmint.config import Config
from planetmint.backend.connection import Connection
from planetmint.common.exceptions import ValidationError
from planetmint.common.utils import validate_all_values_for_key_in_obj, validate_all_values_for_key_in_list

View File

@ -21,7 +21,7 @@ logger = logging.getLogger(__name__)
class TarantoolDB:
def __init__(self, host: str = "localhost", port: int = 3301, user: str = "guest", password: str = "",
def __init__(self, host: str = None, port: int = None, user: str = None, password: str = None,
reset_database: bool = False):
self.host = host
self.port = port

View File

@ -35,6 +35,7 @@ from planetmint.tendermint_utils import public_key_from_base64
from planetmint.commands.election_types import elections
from planetmint.version import __tm_supported_versions__
from planetmint.config import Config
logging.basicConfig(level=logging.INFO)
logger = logging.getLogger(__name__)
@ -269,7 +270,6 @@ def run_drop(args):
drop_tarantool()
def run_recover(b):
rollback(b)

View File

@ -66,8 +66,8 @@ class Config(metaclass=Singleton):
'port': 3301,
"connect_now": True,
"encoding": "utf-8",
"login": "guest",
'password': None,
"login": "planetmint",
'password': "planet_user",
"service": "tarantoolctl connect",
"init_config": self.__private_init_config,
"drop_config": self.__private_drop_config,
@ -99,7 +99,6 @@ class Config(metaclass=Singleton):
'port': 26657,
'version': 'v0.31.5', # look for __tm_supported_versions__
},
# TODO Maybe remove hardcode configs for tarantool (review)
'database': self.__private_database_map,
'log': {
'file': log_config['handlers']['file']['filename'],

View File

@ -77,7 +77,7 @@ class Planetmint(object):
else:
self.validation = BaseValidationRules
# planetmint.backend.tarantool.connection_tarantool.connect(**Config().get()['database'])
self.connection = connection if connection else planetmint.backend.Connection().get_connection()
self.connection = connection if connection is not None else planetmint.backend.Connection().get_connection()
def post_transaction(self, transaction, mode):
"""Submit a valid transaction to the mempool."""