Add a `configdir` cli option

kivy_mainline_and_py3.8
Tyler Goodlet 2019-02-25 20:22:29 -05:00
parent 747d703d92
commit d3fae00e74
1 changed files with 7 additions and 2 deletions

View File

@ -13,8 +13,8 @@ import trio
import tractor import tractor
from . import watchlists as wl from . import watchlists as wl
from .brokers import core, get_brokermod, data
from .log import get_console_log, colorize_json, get_logger from .log import get_console_log, colorize_json, get_logger
from .brokers import core, get_brokermod, data, config
from .brokers.core import maybe_spawn_brokerd_as_subactor, _data_mods from .brokers.core import maybe_spawn_brokerd_as_subactor, _data_mods
log = get_logger('cli') log = get_logger('cli')
@ -53,8 +53,13 @@ def pikerd(loglevel, host, tl):
@click.option('--broker', '-b', default=DEFAULT_BROKER, @click.option('--broker', '-b', default=DEFAULT_BROKER,
help='Broker backend to use') help='Broker backend to use')
@click.option('--loglevel', '-l', default='warning', help='Logging level') @click.option('--loglevel', '-l', default='warning', help='Logging level')
@click.option('--configdir', '-c', help='Configuration directory')
@click.pass_context @click.pass_context
def cli(ctx, broker, loglevel): def cli(ctx, broker, loglevel, configdir):
if configdir is not None:
assert os.path.isdir(configdir), f"`{configdir}` is not a valid path"
config._override_config_dir(configdir)
# ensure that ctx.obj exists even though we aren't using it (yet) # ensure that ctx.obj exists even though we aren't using it (yet)
ctx.ensure_object(dict) ctx.ensure_object(dict)
ctx.obj.update({ ctx.obj.update({