From eb92f8f78c0c0b5bba8f482178283e22ad74d290 Mon Sep 17 00:00:00 2001 From: nolash Date: Mon, 19 Jul 2021 12:51:38 +0200 Subject: [PATCH] Upgrade confini code in migrate script --- scripts/migrate.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/migrate.py b/scripts/migrate.py index 7a9245a..da135e2 100644 --- a/scripts/migrate.py +++ b/scripts/migrate.py @@ -18,6 +18,7 @@ logg = logging.getLogger() rootdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) dbdir = os.path.join(rootdir, 'chaind', 'db') +configdir = os.path.join(rootdir, 'chaind', 'data', 'config') default_migrations_dir = os.path.join(dbdir, 'migrations') env = Environment(env=os.environ) @@ -39,7 +40,7 @@ elif args.v: # process config logg.debug('loading config from {}'.format(args.c)) -config = confini.Config(args.c, args.env_prefix) +config = confini.Config(configdir, args.env_prefix, override_dirs=[args.c]) config.process() args_override = { 'SESSION_DATA_DIR': getattr(args, 'data_dir'), @@ -47,7 +48,7 @@ args_override = { config.dict_override(args_override, 'cli args') if config.get('DATABASE_ENGINE') == 'sqlite': - config.add(os.path.join(config.get('SESSION_DATA_DIR'), config.get('DATABASE_NAME')), 'DATABASE_NAME', True) + config.add(os.path.join(config.get('SESSION_DATA_DIR'), config.get('DATABASE_NAME') + '.sqlite'), 'DATABASE_NAME', True) config.censor('PASSWORD', 'DATABASE')