[WIP] next try

This commit is contained in:
2023-09-12 09:45:32 +02:00
parent 3c96bd3eab
commit 68153df77c
2 changed files with 21 additions and 19 deletions

View File

@@ -69,7 +69,7 @@ def all_info(all_cfg):
info.append('%s=%r' % (srv, cfginfo))
else:
info.append(repr(cfginfo))
return 'currently configured: frappy(%s)' % ', '.join(info)
return 'frappy(%s)' % ', '.join(info)
def frappy_start(**services):
@@ -178,10 +178,10 @@ def frappy(*args, main=None, stick=None, addons=None):
raise TypeError('got multiple values for addons')
addons = ','.join(alist)
allcfg = frappy_start(main=main, stick=stick, addons=addons)
session.log.info(all_info(allcfg))
session.log.info('currently configured %s', all_info(allcfg))
else:
allcfg = frappy_start(main=main, stick=stick, addons=addons)
session.log.info(all_info(allcfg))
session.log.info('currently configured %s', all_info(allcfg))
guess1 = {}
guess2 = {}
for s in SERVICES:
@@ -198,9 +198,9 @@ def frappy(*args, main=None, stick=None, addons=None):
elif guess1 or guess2:
session.log.info('please consider to call:')
if guess1:
session.log.info(all_info(guess1))
session.log.info('from frappy / cache: %s', all_info(guess1))
if guess2:
session.log.info(all_info(guess2))
session.log.info('including info from sea: %s', all_info(guess2))
@usercommand
@@ -211,7 +211,7 @@ def frappy_main(cfg=None):
- without argument: list running frappy servers
- cfg = "": stop frappy_main server
"""
session.log.info(all_info(frappy_start(main=cfg)))
session.log.info('currently configured %s', all_info(frappy_start(main=cfg)))
@usercommand
@@ -222,7 +222,7 @@ def frappy_stick(cfg=None):
- without argument: list running frappy servers
- cfg = "": stop frappy_stick server
"""
session.log.info(all_info(frappy_start(stick=cfg)))
session.log.info('currently configured %s', all_info(frappy_start(stick=cfg)))
@usercommand
@@ -233,7 +233,7 @@ def frappy_addons(cfg=None):
- without argument: list running frappy servers
- cfg = "": stop frappy_addons server
"""
session.log.info(all_info(frappy_start(addons=cfg)))
session.log.info('currently configured %s', all_info(frappy_start(addons=cfg)))
@usercommand