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

Split handling of hook_exec according to hook type

Browse source
This commit is contained in:
Alexandre Aubin 2019-07-05 22:24:48 +02:00
parent ac7102a0ca
commit 2e6932928b
1 changed files with 49 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/yunohost/hook.py
View file

@ -311,7 +311,6 @@ def hook_exec(path, args=None, raise_on_error=False, no_trace=False,
user -- User with which to run the command
"""
from moulinette.utils.process import call_async_output
# Validate hook path
if path[0] != '/':
@ -319,6 +318,49 @@ def hook_exec(path, args=None, raise_on_error=False, no_trace=False,
if not os.path.isfile(path):
raise YunohostError('file_does_not_exist', path=path)
# Check the type of the hook (bash by default)
hook_type = "bash"
# (non-bash hooks shall start with something like "#!/usr/bin/env language")
hook_ext = os.path.splitext(path)[1]
if hook_ext == ".py":
hook_type = "python"
else:
# TODO / FIXME : if needed in the future, implement support for other
# languages...
assert hook_ext == "", "hook_exec only supports bash and python hooks for now"
# Define output loggers and call command
loggers = (
lambda l: logger.debug(l.rstrip()+"\r"),
lambda l: logger.warning(l.rstrip()),
lambda l: logger.info(l.rstrip())
)
if hook_type == "bash":
returncode, returndata = _hook_exec_bash(path, args, no_trace, chdir, env, user, return_format, loggers)
elif hook_type == "python":
returncode, returndata = _hook_exec_python(path, args, env, loggers)
else:
# Doesn't happen ... c.f. previous assertion
returncode, returndata = None, {}
# Check and return process' return code
if returncode is None:
if raise_on_error:
raise YunohostError('hook_exec_not_terminated', path=path)
else:
logger.error(m18n.n('hook_exec_not_terminated', path=path))
return 1, {}
elif raise_on_error and returncode != 0:
raise YunohostError('hook_exec_failed', path=path)
return returncode, returndata
def _hook_exec_bash(path, args, no_trace, chdir, env, user, return_format, loggers):
from moulinette.utils.process import call_async_output
# Construct command variables
cmd_args = ''
if args and isinstance(args, list):
@ -369,33 +411,13 @@ def hook_exec(path, args=None, raise_on_error=False, no_trace=False,
else:
logger.debug(m18n.n('executing_script', script=path))
# Define output callbacks and call command
callbacks = (
lambda l: logger.debug(l.rstrip()+"\r"),
lambda l: logger.warning(l.rstrip()),
)
if stdinfo:
callbacks = (callbacks[0], callbacks[1],
lambda l: logger.info(l.rstrip()))
logger.debug("About to run the command '%s'" % command)
returncode = call_async_output(
command, callbacks, shell=False, cwd=chdir,
command, loggers, shell=False, cwd=chdir,
stdinfo=stdinfo
)
# Check and return process' return code
if returncode is None:
if raise_on_error:
raise YunohostError('hook_exec_not_terminated', path=path)
else:
logger.error(m18n.n('hook_exec_not_terminated', path=path))
return 1, {}
elif raise_on_error and returncode != 0:
raise YunohostError('hook_exec_failed', path=path)
raw_content = None
try:
with open(stdreturn, 'r') as f:
@ -427,6 +449,11 @@ def hook_exec(path, args=None, raise_on_error=False, no_trace=False,
return returncode, returncontent
def _hook_exec_python(path, args, env, loggers):
pass
def _extract_filename_parts(filename):
"""Extract hook parts from filename"""
if '-' in filename: