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

Rework timeout mechanism

Browse source
This commit is contained in:
Alexandre Aubin 2023-11-23 18:47:58 +01:00
parent 52ef23a2cb
commit 46b86e3070
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
run.py
View file

@ -604,9 +604,10 @@ async def run_job(worker, job):
+ ":/usr/local/bin", # This is because lxc/lxd is in /usr/local/bin + ":/usr/local/bin", # This is because lxc/lxd is in /usr/local/bin
} }
now = datetime.now().strftime("%d/%m/%Y - %H:%M:%S") begin = datetime.now()
begin_human = begin.strftime("%d/%m/%Y - %H:%M:%S")
msg = ( msg = (
now begin_human
+ f" - Starting test for {job.name} on arch {app.config.ARCH}, distrib {app.config.DIST}, with YunoHost {app.config.YNH_BRANCH}" + f" - Starting test for {job.name} on arch {app.config.ARCH}, distrib {app.config.DIST}, with YunoHost {app.config.YNH_BRANCH}"
) )
job.log += "=" * len(msg) + "\n" job.log += "=" * len(msg) + "\n"
@ -637,7 +638,7 @@ async def run_job(worker, job):
if os.path.exists(summary_png): if os.path.exists(summary_png):
os.remove(summary_png) os.remove(summary_png)
cmd = f"timeout --signal TERM {app.config.TIMEOUT} nice --adjustment=10 script -qefc '/bin/bash {app.config.PACKAGE_CHECK_PATH} {job.url_or_path} 2>&1'" cmd = f"nice --adjustment=10 script -qefc '/bin/bash {app.config.PACKAGE_CHECK_PATH} {job.url_or_path} 2>&1'"
task_logger.info(f"Launching command: {cmd}") task_logger.info(f"Launching command: {cmd}")
try: try:
@ -652,8 +653,13 @@ async def run_job(worker, job):
) )
while not command.stdout.at_eof(): while not command.stdout.at_eof():
data = await command.stdout.readline()
try:
data = await asyncio.wait_for(command.stdout.readline(), 60)
except asyncio.TimeoutError:
if (datetime.now() - begin).total_seconds() > app.config.TIMEOUT:
raise Exception(f"Job timed out ({app.config.TIMEOUT / 60} min.)")
else:
try: try:
job.log += data.decode("utf-8", "replace") job.log += data.decode("utf-8", "replace")
except UnicodeDecodeError as e: except UnicodeDecodeError as e: