Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions helpers/helpers.v2.1.d/0-utils
Original file line number Diff line number Diff line change
Expand Up @@ -629,3 +629,21 @@ function _ynh_git_clone() {
git reset --hard origin/"$branch"
popd || return 1
}


function ynh_new_systemctl() {
_ynh_helper_api "$@"
}

function _ynh_helper_api() {
local request="{\"cmd\": \"${FUNCNAME[1]}\", \"args\": \"$@\"}"
echo "Calling helper api with:"
echo "$request" | jq
cat <<< "$request" >&"$YNH_HELPERAPI_OUT"
local ret
read -u $YNH_HELPERAPI_IN ret

echo "Got return data:"
echo "$ret" | jq

}
68 changes: 65 additions & 3 deletions src/utils/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import logging
import os
import subprocess
import json

# FIXME: wtf ? what was that x_x
# Prevent to import subprocess only for common classes
Expand Down Expand Up @@ -75,11 +76,19 @@ def call_async_output(args, callback, **kwargs) -> int | None:
kwargs["stdout"] = LogPipe(callback[0], log_queue)
kwargs["stderr"] = LogPipe(callback[1], log_queue)
stdinfo = LogPipe(callback[2], log_queue) if len(callback) >= 3 else None
if stdinfo:
kwargs["pass_fds"] = [stdinfo.fdWrite]
helperapi = HelperAPI()

if stdinfo or helperapi:
if "env" not in kwargs:
kwargs["env"] = os.environ
kwargs["env"]["YNH_STDINFO"] = str(stdinfo.fdWrite)
kwargs["pass_fds"] = []
if stdinfo:
kwargs["pass_fds"] += [stdinfo.fdWrite]
kwargs["env"]["YNH_STDINFO"] = str(stdinfo.fdWrite)
if helperapi:
kwargs["pass_fds"] += [helperapi.fdWriteToYnh, helperapi.fdReadFromYnh]
kwargs["env"]["YNH_HELPERAPI_OUT"] = str(helperapi.fdWriteToYnh)
kwargs["env"]["YNH_HELPERAPI_IN"] = str(helperapi.fdReadFromYnh)

if "env" in kwargs and not all(isinstance(v, str) for v in kwargs["env"].values()):
logger.warning(
Expand Down Expand Up @@ -109,6 +118,8 @@ def call_async_output(args, callback, **kwargs) -> int | None:
kwargs["stderr"].close()
if stdinfo:
stdinfo.close()
if helperapi:
helperapi.close()

return p.poll()

Expand All @@ -130,6 +141,57 @@ def call_async_output(args, callback, **kwargs) -> int | None:
FileObjectThread = os.fdopen # type: ignore[assignment,misc]


def ynh_systemctl(args):
service, action = args.split()

p = subprocess.run(["systemctl", action, service])
return {"returncode": p.returncode, "data": {}, "error": {}}

class HelperAPI(Thread):

def __init__(self):
"""Setup the object with a logger and a loglevel
and start the thread
"""
Thread.__init__(self)
self.daemon = False

self.fdReadFromScript, self.fdWriteToYnh = os.pipe()
self.fdReadFromYnh, self.fdWriteToScript = os.pipe()
self.pipeReaderFromScript = FileObjectThread(self.fdReadFromScript, "rb")

self.start()

def run(self):

helpers = {
"ynh_new_systemctl": ynh_systemctl
}

for cmd in iter(self.pipeReaderFromScript.readline, b""):
try:
cmd = json.loads(cmd.decode("utf-8").strip("\n"))
except Exception as e:
msg = f"Failed to parse cmd from helper API: {cmd}. Error: {e}"
logger.warning(msg)
ret = {"returncode": 128, "data": {}, "error": f}
os.write(self.fdWriteToScript, bytes((json.dumps(ret) + "\n").encode()))
else:
logger.info(f"Received cmd: {cmd}")
ret = helpers[cmd['cmd']](cmd['args'])
logger.info(f"Answering: {ret}")
os.write(self.fdWriteToScript, bytes((json.dumps(ret) + "\n").encode()))

self.pipeReaderFromScript.close()
os.close(self.fdWriteToScript)

def close(self):
os.close(self.fdWriteToYnh)
#os.close(self.fdWriteToScript)




class LogPipe(Thread): # type: ignore[valid-type,misc] # Don't know why mypy doesnt like this
# Adapted from https://codereview.stackexchange.com/a/17959
def __init__(self, log_callback, queue):
Expand Down
Loading