chaintool/chaind
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade confini code in migrate script

Browse Source
This commit is contained in:
nolash 2021-07-19 12:51:38 +02:00
parent 2170bb34fa
commit eb92f8f78c
Signed by: lash
GPG Key ID: 21D2E7BB88C2A746
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/migrate.py
View File

@ -18,6 +18,7 @@ logg = logging.getLogger()
rootdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) rootdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
dbdir = os.path.join(rootdir, 'chaind', 'db') dbdir = os.path.join(rootdir, 'chaind', 'db')
configdir = os.path.join(rootdir, 'chaind', 'data', 'config')
default_migrations_dir = os.path.join(dbdir, 'migrations') default_migrations_dir = os.path.join(dbdir, 'migrations')
env = Environment(env=os.environ) env = Environment(env=os.environ)
@ -39,7 +40,7 @@ elif args.v:
# process config # process config
logg.debug('loading config from {}'.format(args.c)) 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() config.process()
args_override = { args_override = {
'SESSION_DATA_DIR': getattr(args, 'data_dir'), 'SESSION_DATA_DIR': getattr(args, 'data_dir'),
@ -47,7 +48,7 @@ args_override = {
config.dict_override(args_override, 'cli args') config.dict_override(args_override, 'cli args')
if config.get('DATABASE_ENGINE') == 'sqlite': 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') config.censor('PASSWORD', 'DATABASE')