From a3c1f5d64ff4933ac95ab8eaeb7fbb69a700024b Mon Sep 17 00:00:00 2001
From: Romain Broucquart <romain.broucquart@synchrotron-soleil.fr>
Date: Thu, 10 Nov 2022 10:40:50 +0100
Subject: [PATCH] Fix retry exception for Device command extract
* The previous code did not handle the retry correctly
---
core/ArchiveExtractor.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/ArchiveExtractor.py b/core/ArchiveExtractor.py
index 6e1c1d3..fa50230 100755
--- a/core/ArchiveExtractor.py
+++ b/core/ArchiveExtractor.py
@@ -447,7 +447,7 @@ class ArchiveExtractor:
None if failed after the amount of retries.
"""
- for i in range(retry-1):
+ for i in range(retry):
# Make retrieval request
self.logger.debug("Execute %s (%s)"%(cmd, arg))
try:
@@ -455,12 +455,12 @@ class ArchiveExtractor:
except tango.DevFailed as e:
self.logger.warning("The extractor device returned the following error:")
self.logger.warning(e)
+ if i == retry-1:
+ logger.error("Could not execute command %s (%s). Check the device extractor"%(cmd, arg))
+ return None
self.logger.warning("Retrying...")
continue
break
- if i==2:
- logger.error("Could not execute command %s (%s). Check the device extractor"%(cmd, arg))
- return None
return cmdreturn
--
GitLab