Skip to content

Commit 500db67

Browse files
authored
Update scheduler.py to reflect migration for timeout function (#2763)
* Update scheduler.py to reflect migration for timeout function * Update database.py
1 parent dc8af91 commit 500db67

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/cuckoo/core/database.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2223,7 +2223,7 @@ def clean_timed_out_tasks(self, timeout: int):
22232223
return
22242224

22252225
# Calculate the cutoff time before which tasks are considered timed out.
2226-
timeout_threshold = datetime.now() - timedelta(seconds=timeout)
2226+
timeout_threshold = datetime.utcnow() - timedelta(seconds=timeout)
22272227

22282228
# Build a single, efficient DELETE statement that filters in the database.
22292229
delete_stmt = delete(Task).where(Task.status == TASK_PENDING).where(Task.added_on < timeout_threshold)

lib/cuckoo/core/scheduler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def do_main_loop_work(self, error_queue: queue.Queue) -> SchedulerCycleDelay:
105105
if self.next_timeout_time < time.time():
106106
self.next_timeout_time = time.time() + self.cfg.cuckoo.get("task_timeout_scan_interval", 30)
107107
with self.db.session.begin():
108-
self.db.check_tasks_timeout(self.cfg.cuckoo.get("task_pending_timeout", 0))
108+
self.db.clean_timed_out_tasks(self.cfg.cuckoo.get("task_pending_timeout", 0))
109109

110110
analysis_manager: Optional[AnalysisManager] = None
111111
with self.db.session.begin():

0 commit comments

Comments
 (0)