From 489ead31d2a7725de2f33293fbd04030f993a583 Mon Sep 17 00:00:00 2001 From: Shreya Malviya Date: Fri, 23 Sep 2022 18:06:28 +0530 Subject: [PATCH] Island: 'kill_time' -> 'terminate_time' --- monkey/monkey_island/cc/resources/agent_signals.py | 2 +- monkey/monkey_island/cc/services/infection_lifecycle.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/monkey/monkey_island/cc/resources/agent_signals.py b/monkey/monkey_island/cc/resources/agent_signals.py index 765ea5d8d..01c8f0b7f 100644 --- a/monkey/monkey_island/cc/resources/agent_signals.py +++ b/monkey/monkey_island/cc/resources/agent_signals.py @@ -24,7 +24,7 @@ class AgentSignals(AbstractResource): def post(self): try: - terminate_timestamp = request.json["kill_time"] + terminate_timestamp = request.json["terminate_time"] if terminate_timestamp is None: raise ValueError("Terminate signal's timestamp is empty") diff --git a/monkey/monkey_island/cc/services/infection_lifecycle.py b/monkey/monkey_island/cc/services/infection_lifecycle.py index e1e3a831e..ef11ce5b1 100644 --- a/monkey/monkey_island/cc/services/infection_lifecycle.py +++ b/monkey/monkey_island/cc/services/infection_lifecycle.py @@ -27,14 +27,14 @@ def _should_agent_stop(monkey: Monkey) -> bool: def _is_monkey_killed_manually(monkey: Monkey) -> bool: - kill_timestamp = AgentControls.objects.first().last_stop_all - if kill_timestamp is None: + terminate_timestamp = AgentControls.objects.first().last_stop_all + if terminate_timestamp is None: return False if monkey.has_parent(): launch_timestamp = monkey.get_parent().launch_time else: launch_timestamp = monkey.launch_time - return int(kill_timestamp) >= int(launch_timestamp) + return int(terminate_timestamp) >= int(launch_timestamp) def get_completed_steps():