LocalExecutor: fix timeout expiring too soon

tbarbette · Nov 16, 2024 · f59a7fa · f59a7fa
1 parent bda059d
commit f59a7fa
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/npf/executor/localexecutor.py b/npf/executor/localexecutor.py
@@ -7,6 +7,7 @@
 from typing import List
 from .executor import Executor
 from pathlib import Path
+import time
 
 class LocalKiller:
     def __init__(self, pgpid):
@@ -92,6 +93,7 @@ def exec(self, cmd : str, bin_paths : List[str]=[],
         flushing = False
 
         step = 0.2
+        start = time.time()
         killer = LocalKiller(pgpid)
         if queue:
             queue.put(killer)
@@ -115,8 +117,7 @@ def exec(self, cmd : str, bin_paths : List[str]=[],
 
 
                 if timeout is not None:
-                    timeout -= step
-                    if timeout < 0:
+                    if timeout < time.time() - start:
                         raise TimeoutExpired(cmd, timeout)
 
             p.stdin.close()