From 26b62c8c94a72bff3f71c0f5d7f582e813dceafa Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Wed, 3 Mar 2021 14:51:50 +0000
Subject: [PATCH] Don't duplicate runs/wait_runs variable
---
webservice/webservice.py | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/webservice/webservice.py b/webservice/webservice.py
index 6477aead8..d01b9cdde 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -987,7 +987,7 @@ class ActionsServer:
pdus, karabo_das, wait_runs = eval(','.join(extra))
karabo_das = [val.strip() for val in karabo_das]
- wait_runs = [str(val) for val in wait_runs]
+ runs = [str(val) for val in wait_runs]
proposal = self._normalise_proposal_num(proposal)
@@ -1000,8 +1000,6 @@ class ActionsServer:
logging.info(f'Instrument {instrument} is unknown')
return Errors.NOT_CONFIGURED.encode()
- runs = [str(r) for r in wait_runs]
-
in_folder = self.config['dark']['in-folder'].format(
instrument=instrument, cycle=cycle, proposal=proposal)
out_folder = self.config['dark']['out-folder'].format(
@@ -1017,7 +1015,7 @@ class ActionsServer:
)
return msg.encode()
- queued_msg = Success.QUEUED.format(proposal, wait_runs)
+ queued_msg = Success.QUEUED.format(proposal, runs)
logging.debug(queued_msg)
async def _continue():
@@ -1025,7 +1023,7 @@ class ActionsServer:
await update_mdc_status(self.mdc, 'dark_request', rid, queued_msg)
transfer_complete = await wait_transfers(
- wait_runs, in_folder, proposal
+ runs, in_folder, proposal
)
if not transfer_complete:
# Timed out
@@ -1069,7 +1067,7 @@ class ActionsServer:
detectors = {karabo_id: thisconf}
ret, report_path = await self.launch_jobs(
- wait_runs, rid, detectors, 'dark', instrument, cycle, proposal,
+ runs, rid, detectors, 'dark', instrument, cycle, proposal,
request_time
)
await update_mdc_status(self.mdc, 'dark_request', rid, ret)
--
GitLab