kamikazechaser/cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make -c switch config override

Browse Source
This commit is contained in:
nolash 2021-09-29 07:31:13 +02:00
parent 86592b837a
commit e251612487
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/util/initness/initness/runnable/server.py
View File

@ -22,9 +22,10 @@ logg = logging.getLogger()
script_dir = os.path.dirname(os.path.realpath(__file__)) script_dir = os.path.dirname(os.path.realpath(__file__))
data_dir = os.path.join(script_dir, '..', 'data') data_dir = os.path.join(script_dir, '..', 'data')
default_config_dir = os.path.join(data_dir, 'config') default_config_dir = os.path.join(data_dir, 'config')
config_dir = os.environ.get('CONFINI_DIR', default_config_dir)
argparser = argparse.ArgumentParser() argparser = argparse.ArgumentParser()
argparser.add_argument('-c', '--config', dest='c', default=default_config_dir, type=str, help='rpc provider') argparser.add_argument('-c', '--config', dest='c', type=str, help='configuration override directory')
argparser.add_argument('--host', type=str, help='httpd host') argparser.add_argument('--host', type=str, help='httpd host')
argparser.add_argument('--port', type=str, help='httpd port') argparser.add_argument('--port', type=str, help='httpd port')
argparser.add_argument('--state-dir', dest='state_dir', type=str, help='directory to read state from') argparser.add_argument('--state-dir', dest='state_dir', type=str, help='directory to read state from')
@ -38,7 +39,10 @@ if args.vv:
elif args.v: elif args.v:
logging.getLogger().setLevel(logging.INFO) logging.getLogger().setLevel(logging.INFO)
config = confini.Config(args.c, args.env_prefix) override_dirs = []
if args.c:
override_dirs = [args.c]
config = confini.Config(config_dir, args.env_prefix, override_dirs=override_dirs)
config.process() config.process()
# override args # override args
args_override = { args_override = {