Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion dotflow/core/action.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,19 +144,32 @@ def _run_action(self, *args, task=None, **kwargs):
for attempt in range(1, self.retry + 1):
try:
if self.timeout:
with ThreadPoolExecutor(max_workers=1) as executor:
executor = ThreadPoolExecutor(max_workers=1)
try:
future = executor.submit(
self._call_func,
is_async,
*args,
**kwargs,
)
result = future.result(timeout=self.timeout)
except TimeoutError:
future.cancel()
executor.shutdown(wait=False, cancel_futures=True)
raise
except Exception:
executor.shutdown(wait=False)
raise
else:
executor.shutdown(wait=False)
else:
result = self._call_func(is_async, *args, **kwargs)

return result

except TimeoutError:
raise

except Exception as error:
last_exception = error

Expand Down
Loading