Retry to convert report also on subprocess error
issue10938 review370221002 (grafted from a844f8db203bb29af00836aa21c053354c18cfd3) --HG-- branch : 6.0
This commit is contained in:
1 parent
de998ddc68
commit
6cb8d5f7fc
1 file changed
+10
-2
@@ -358,14 +358,22 @@ class Report(URLMixin, PoolBase):
|
||||
for count in range(retry, -1, -1):
|
||||
if count != retry:
|
||||
time.sleep(0.02 * (retry - count))
|
||||
subprocess.check_call(cmd, timeout=timeout)
|
||||
try:
|
||||
subprocess.check_call(cmd, timeout=timeout)
|
||||
except subprocess.CalledProcessError:
|
||||
if count:
|
||||
continue
|
||||
logger.error(
|
||||
"fail to convert %s to %s", report.report_name, oext,
|
||||
exc_info=True)
|
||||
break
|
||||
if os.path.exists(output):
|
||||
with open(output, 'rb') as fp:
|
||||
return oext, fp.read()
|
||||
else:
|
||||
logger.error(
|
||||
'fail to convert %s to %s', report.report_name, oext)
|
||||
return input_format, data
|
||||
return input_format, data
|
||||
finally:
|
||||
try:
|
||||
os.remove(path)
|
||||
|
||||
Reference in new issue
Block a user