Skip to content

Commit 526729e

Browse files
committed
Update scheduler.py
1 parent f858cff commit 526729e

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

lib/cuckoo/core/scheduler.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import time
1414
import traceback
1515
from collections import defaultdict
16-
from datetime import datetime
1716
from typing import DefaultDict, List, Optional, Tuple
1817

1918
from lib.cuckoo.common.cleaners_utils import free_space_monitor
@@ -22,7 +21,7 @@
2221
from lib.cuckoo.common.exceptions import CuckooUnserviceableTaskError
2322
from lib.cuckoo.common.utils import CATEGORIES_NEEDING_VM, load_categories
2423
from lib.cuckoo.core.analysis_manager import AnalysisManager
25-
from lib.cuckoo.core.database import TASK_FAILED_ANALYSIS, TASK_PENDING, Database, Machine, Task, _Database
24+
from lib.cuckoo.core.database import TASK_FAILED_ANALYSIS, TASK_PENDING, Database, Machine, Task, _Database, _utcnow_naive
2625
from lib.cuckoo.core.machinery_manager import MachineryManager
2726

2827
log = logging.getLogger(__name__)
@@ -95,7 +94,7 @@ def do_main_loop_work(self, error_queue: queue.Queue) -> SchedulerCycleDelay:
9594
vm_state = self.cfg.timeouts.get("vm_state", 100)
9695
timeout = analysis.task.timeout or self.cfg.timeouts.default
9796
max_runtime = timeout + self.cfg.timeouts.critical + stuck_seconds + vm_state
98-
duration = (datetime.now() - analysis.task.started_on).total_seconds()
97+
duration = (_utcnow_naive - analysis.task.started_on).total_seconds()
9998
if duration > max_runtime:
10099
log.warning(
101100
"Task #%s has been running for %s seconds, which is longer than the configured timeout + critical timeout + 100s. Killing VM.",

0 commit comments

Comments
 (0)