From 5da2d3cbcbeb51cf5391012742d381daa0c14ab6 Mon Sep 17 00:00:00 2001
From: Karim Ahmed <karim.ahmed@xfel.eu>
Date: Fri, 30 Aug 2019 12:07:20 +0200
Subject: [PATCH] copy conf.yaml after a trigger
---
reportservice/report_service.py | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/reportservice/report_service.py b/reportservice/report_service.py
index f1177cc35..1b24f6d08 100644
--- a/reportservice/report_service.py
+++ b/reportservice/report_service.py
@@ -168,15 +168,17 @@ async def server_runner(conf_file):
socket.bind("{}:{}".format(config['GLOBAL']['report-service']['bind-to'],
config['GLOBAL']['report-service']['port']))
- asyncio.ensure_future(copy_files(conf_file,
- config['GLOBAL']['git']['figures-local'],
- sem=None))
-
while True:
response = await socket.recv_pyobj()
await socket.send_pyobj('Build DC reports through -->')
logging.info("response: {}".format(response))
+ # Send the conf.yaml file after receiving a zmq-req.
+ asyncio.ensure_future(copy_files(conf_file,
+ config['GLOBAL']['git']
+ ['figures-local'],
+ sem=None))
+
# Check if response is a list or a dict.
# if list, it should either have instrument names or ['all'].
# if dict, it should acquires the details of the requested reports
@@ -238,7 +240,6 @@ async def server_runner(conf_file):
logging.info('Submission information: {}:'
.format(run_base))
-
except Exception as e:
logging.error('Submission failed: {}'.format(e))
exit(1)
@@ -254,16 +255,13 @@ async def server_runner(conf_file):
logging.error('Submission Error: {}'
.format(output[1].decode('utf8')))
job_list += await parse_output(output[0].decode('utf8'))
-
try:
await asyncio.wait_for(wait_jobs(job_list),
timeout=jobs_timeout)
-
logging.info('All jobs are finished')
except asyncio.TimeoutError:
- asyncio.ensure_future(del_folder('./tmp'))
- logging.error('Jobs timeout!')
+ logging.error('Jobs have timed-out!')
# Copy all plots
for det_name, det_conf in instrument.items():
@@ -296,7 +294,6 @@ async def server_runner(conf_file):
logging.info('{} figures of {} are copied into {}'.format(
len(figures), det_name, path))
-
asyncio.ensure_future(
push_figures(cfg['GLOBAL']['git']['repo-local'],
all_new_files))
--
GitLab