diff --git a/planetmint/__init__.py b/planetmint/__init__.py index 56d820f..a8e927d 100644 --- a/planetmint/__init__.py +++ b/planetmint/__init__.py @@ -5,6 +5,7 @@ import copy import logging +import os from planetmint.log import DEFAULT_LOGGING_CONFIG as log_config from planetmint.lib import Planetmint # noqa @@ -35,12 +36,12 @@ _base_database_tarantool_local_db = { # TODO Rewrite this configs for tarantool } init_config = { "init_file": "init_db.txt", - "relative_path": "backend/tarantool/" + "relative_path": os.path.dirname(os.path.abspath(__file__)) + "/backend/tarantool/" } drop_config = { - "drop_file": "drop_db.txt", - "relative_path": "backend/tarantool/" + "drop_file": "drop_db.txt", # planetmint/backend/tarantool/init_db.txt + "relative_path": os.path.dirname(os.path.abspath(__file__)) + "/backend/tarantool/" } _database_tarantool = { 'backend': 'tarantool_db', diff --git a/planetmint/backend/connection_tarantool.py b/planetmint/backend/connection_tarantool.py index 03fbd8a..15b10ef 100644 --- a/planetmint/backend/connection_tarantool.py +++ b/planetmint/backend/connection_tarantool.py @@ -40,15 +40,17 @@ class TarantoolDB: def drop_database(self): from planetmint.backend.tarantool.utils import run - config = get_planetmint_config_value_or_key_error("ctl_config")["drop_config"] - f_path = "%s%s" % (config["relative_path"], config["drop_file"]) + config = get_planetmint_config_value_or_key_error("ctl_config") + drop_config = config["drop_config"] + f_path = "%s%s" % (drop_config["relative_path"], drop_config["drop_file"]) commands = self.__read_commands(file_path=f_path) run(commands=commands, config=config) def init_database(self): from planetmint.backend.tarantool.utils import run - config = get_planetmint_config_value_or_key_error("ctl_config")["init_config"] - f_path = "%s%s" % (config["relative_path"], config["init_file"]) + config = get_planetmint_config_value_or_key_error("ctl_config") + init_config = config["init_config"] + f_path = "%s%s" % (init_config["relative_path"], init_config["init_file"]) commands = self.__read_commands(file_path=f_path) run(commands=commands, config=config) diff --git a/planetmint/backend/tarantool/drop_db.txt b/planetmint/backend/tarantool/drop_db.txt index 14f513b..275d9a4 100644 --- a/planetmint/backend/tarantool/drop_db.txt +++ b/planetmint/backend/tarantool/drop_db.txt @@ -1,23 +1,23 @@ -abci_chains:drop() +box.space.abci_chains.drop() -assets:drop() +box.space.assets.drop() -blocks:drop() +box.space.blocks.drop() -blocks_tx:drop() +box.space.blocks_tx.drop() -elections:drop() +box.space.elections.drop() -meta_datas:drop() +box.space.meta_datas.drop() -pre_commits:drop() +box.space.pre_commits.drop() -validators:drop() +box.space.validators.drop() -transactions:drop() +box.space.transactions.drop() -inputs:drop() +box.space.inputs.drop() -outputs:drop() +box.space.outputs.drop() -keys:drop() \ No newline at end of file +box.space.keys.drop() \ No newline at end of file