saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Get rid of run_func in salt.Minion._target

Browse source
This commit is contained in:
vzhestkov 2024-05-13 14:47:43 +02:00 • committed by Daniel Wozniak
parent 8a4228e5b3
commit 8743551143
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/minion.py
View file

@ -1857,15 +1857,12 @@ class Minion(MinionBase):
uid = salt.utils.user.get_uid(user=opts.get("user", None))
minion_instance.proc_dir = get_proc_dir(opts["cachedir"], uid=uid)
def run_func(minion_instance, opts, data):
with salt.utils.ctx.request_context({"data": data, "opts": opts}):
if isinstance(data["fun"], tuple) or isinstance(data["fun"], list):
return Minion._thread_multi_return(minion_instance, opts, data)
else:
return Minion._thread_return(minion_instance, opts, data)
with salt.utils.ctx.request_context({"data": data, "opts": opts}):
run_func(minion_instance, opts, data)
def _execute_job_function(
self, function_name, function_args, executors, opts, data
):