diff --git a/onedns/cli.py b/onedns/cli.py index 2dd52b7..443ca98 100644 --- a/onedns/cli.py +++ b/onedns/cli.py @@ -7,13 +7,6 @@ from onedns import monitor from onedns.clients import skydns -def get_kwargs(args, prefix): - args_dict = vars(args) - one_args = dict((i.replace(prefix, ''), args_dict[i]) - for i in args_dict.keys() if i.startswith(prefix)) - return one_args - - def daemon(args, one_args, etcd_args): mon = monitor.OneMonitor(args.domain, one_kwargs=one_args, etcd_kwargs=etcd_args) @@ -112,7 +105,8 @@ def main(): logger.configure_onedns_logging(debug=args.debug) - one_args = get_kwargs(args, 'one_') - etcd_args = get_kwargs(args, 'etcd_') + args_dict = vars(args) + one_args = utils.get_kwargs_from_dict(args_dict, 'one_') + etcd_args = utils.get_kwargs_from_dict(args_dict, 'etcd_') args.func(args, one_args, etcd_args) diff --git a/onedns/utils.py b/onedns/utils.py index 41eb18b..b49ca00 100644 --- a/onedns/utils.py +++ b/onedns/utils.py @@ -1,6 +1,12 @@ from onedns.logger import log +def get_kwargs_from_dict(d, prefix): + kwargs = dict((i.replace(prefix, ''), d[i]) + for i in d.keys() if i.startswith(prefix)) + return kwargs + + def shell(local_ns={}): try: from IPython import embed