From d0440ff50ef352af396eebe29390df332eef3e7d Mon Sep 17 00:00:00 2001
From: Karim Ahmed <ahmedk@exflqr13068.desy.de>
Date: Tue, 20 Aug 2019 16:05:42 +0200
Subject: [PATCH] move timout ctrl from CL to conf.yaml
---
reportservice/report_service.py | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/reportservice/report_service.py b/reportservice/report_service.py
index 88bd8de70..9428f3b08 100644
--- a/reportservice/report_service.py
+++ b/reportservice/report_service.py
@@ -136,7 +136,7 @@ async def push_figures(repo_master, addf):
logging.info('Pushed to git')
-async def server_runner(conf_file, jobs_timeout):
+async def server_runner(conf_file):
"""
The main server loop. After pulling the latest changes
of the DC project, it awaits receiving configurations
@@ -201,10 +201,12 @@ async def server_runner(conf_file, jobs_timeout):
continue
logging.info('Requested Configuration: {}'.format(req_cfg))
-
- async def do_action(cfg, jobs_timeout=3000):
+
+ async def do_action(cfg):
logging.info('Run plot production')
+ jobs_timeout = cfg['GLOBAL']['report-service']['job-timeout']
+
all_new_files = []
all_new_files.append('{}/{}'.format(config['GLOBAL']
['git']
@@ -301,9 +303,8 @@ async def server_runner(conf_file, jobs_timeout):
return
-
try:
- asyncio.ensure_future(do_action(copy.copy(req_cfg), jobs_timeout))
+ asyncio.ensure_future(do_action(copy.copy(req_cfg)))
except Exception as e: # actions that fail are only error logged
logging.error(str(e))
break
@@ -313,8 +314,6 @@ arg_parser.add_argument('--config-file', type=str,
default='./report_conf.yaml',
help='config file path with reportservice port. '
'Default=./report_conf.yaml')
-arg_parser.add_argument('--jobs-timeout', type=int, default=3000,
- help='Maximum time to wait for jobs. Default=3000')
arg_parser.add_argument('--log-file', type=str, default='./report.log',
help='The report log file path. Default=./report.log')
arg_parser.add_argument('--logging', type=str, default="INFO",
@@ -335,5 +334,5 @@ if __name__ == "__main__":
datefmt='%Y-%m-%d %H:%M:%S')
loop = asyncio.get_event_loop()
- loop.run_until_complete(server_runner(conf_file, args["jobs_timeout"]))
+ loop.run_until_complete(server_runner(conf_file))
loop.close()
--
GitLab