YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] integrate actions/config-panel into operation_logs

Browse source
This commit is contained in:
Laurent Peuch 2019-07-29 22:58:05 +02:00
parent 933bf99052
commit 2978df56fb
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/yunohost/app.py
View file

@ -1466,7 +1466,8 @@ def app_action_list(app):
} }
def app_action_run(app, action, args=None): @is_unit_operation()
def app_action_run(operation_logger, app, action, args=None):
logger.warning(m18n.n('experimental_feature')) logger.warning(m18n.n('experimental_feature'))
from yunohost.hook import hook_exec from yunohost.hook import hook_exec
@ -1479,6 +1480,8 @@ def app_action_run(app, action, args=None):
if action not in actions: if action not in actions:
raise YunohostError("action '%s' not available for app '%s', available actions are: %s" % (action, app, ", ".join(actions.keys())), raw_msg=True) raise YunohostError("action '%s' not available for app '%s', available actions are: %s" % (action, app, ", ".join(actions.keys())), raw_msg=True)
operation_logger.start()
action_declaration = actions[action] action_declaration = actions[action]
# Retrieve arguments list for install script # Retrieve arguments list for install script
@ -1515,17 +1518,21 @@ def app_action_run(app, action, args=None):
)[0] )[0]
if retcode not in action_declaration.get("accepted_return_codes", [0]): if retcode not in action_declaration.get("accepted_return_codes", [0]):
raise YunohostError("Error while executing action '%s' of app '%s': return code %s" % (action, app, retcode), raw_msg=True) msg = "Error while executing action '%s' of app '%s': return code %s" % (action, app, retcode)
operation_logger.error(msg)
raise YunohostError(msg, raw_msg=True)
os.remove(path) os.remove(path)
operation_logger.success()
return logger.success("Action successed!") return logger.success("Action successed!")
# Config panel todo list: # Config panel todo list:
# * docstrings # * docstrings
# * merge translations on the json once the workflow is in place # * merge translations on the json once the workflow is in place
def app_config_show_panel(app): @is_unit_operation()
def app_config_show_panel(operation_logger, app):
logger.warning(m18n.n('experimental_feature')) logger.warning(m18n.n('experimental_feature'))
from yunohost.hook import hook_exec from yunohost.hook import hook_exec
@ -1533,6 +1540,7 @@ def app_config_show_panel(app):
# this will take care of checking if the app is installed # this will take care of checking if the app is installed
app_info_dict = app_info(app) app_info_dict = app_info(app)
operation_logger.start()
config_panel = _get_app_config_panel(app) config_panel = _get_app_config_panel(app)
config_script = os.path.join(APPS_SETTING_PATH, app, 'scripts', 'config') config_script = os.path.join(APPS_SETTING_PATH, app, 'scripts', 'config')
@ -1596,10 +1604,12 @@ def app_config_show_panel(app):
"app": app, "app": app,
"app_name": app_info_dict["name"], "app_name": app_info_dict["name"],
"config_panel": config_panel, "config_panel": config_panel,
"logs": operation_logger.success(),
} }
def app_config_apply(app, args): @is_unit_operation()
def app_config_apply(operation_logger, app, args):
logger.warning(m18n.n('experimental_feature')) logger.warning(m18n.n('experimental_feature'))
from yunohost.hook import hook_exec from yunohost.hook import hook_exec
@ -1615,6 +1625,7 @@ def app_config_apply(app, args):
# XXX real exception # XXX real exception
raise Exception("Not config-panel.json nor scripts/config") raise Exception("Not config-panel.json nor scripts/config")
operation_logger.start()
app_id, app_instance_nb = _parse_app_instance_name(app) app_id, app_instance_nb = _parse_app_instance_name(app)
env = { env = {
"YNH_APP_ID": app_id, "YNH_APP_ID": app_id,
@ -1648,9 +1659,14 @@ def app_config_apply(app, args):
)[0] )[0]
if return_code != 0: if return_code != 0:
raise Exception("'script/config apply' return value code: %s (considered as an error)", return_code) msg = "'script/config apply' return value code: %s (considered as an error)" % return_code
operation_logger.error(msg)
raise Exception(msg)
logger.success("Config updated as expected") logger.success("Config updated as expected")
return {
"logs": operation_logger.success(),
}
def _get_app_actions(app_id): def _get_app_actions(app_id):