Fix get_all_cmds when it's the first time we're sending it

Alexis Koralewski
1 parent ed0f85e2
Showing 3 changed files with 22 additions and 13 deletions Show diff stats
CHANGELOG
VERSION
src/core/pyros_django/dashboard/views.py
+18-01-2023 (AKo): v0.6.16.1	
+	- Fix get_all_cmds when it's the first time we're sending it
+
 16-01-2023 (AKo): v0.6.16.0
 	- Change redis container name to pyros-redis
 	- Renaming HOST_NAME env variable to WEBSERVER_HOST_NAME to avoid confusion
-0.6.16.0
 \ No newline at end of file
+0.6.16.1
 \ No newline at end of file
@@ -219,21 +219,27 @@ def get_last_all_cmds(agent_name):
         # AgentSST doesn't have do_stop cmd... (for the moment)
         datetime_now = datetime.datetime.now(tz=timezone.utc)
         time_delta = datetime_now - datetime.timedelta(minutes=30)
-        last_agent_all_cmds = AgentCmd.objects.filter(full_name="get_all_cmds",recipient=agent_name,state__contains="CMD_EXECUTED").latest("s_deposit_time")
-        if time_delta <= last_agent_all_cmds.s_deposit_time:
+        last_agent_all_cmds = AgentCmd.objects.filter(full_name="get_all_cmds",recipient=agent_name,state__contains="CMD_EXECUTED")
+        if last_agent_all_cmds.exits() :
+            last_agent_all_cmds.latest("s_deposit_time")
+            if time_delta <= last_agent_all_cmds.s_deposit_time:
  
+                last_agent_all_cmds = AgentCmd.send_cmd_from_to("System",agent_name,"get_all_cmds")
+                max_wait_time = 3
+                current_wait_time = 0
+                while not AgentCmd.objects.get(id=last_agent_all_cmds.id).is_executed() and not AgentCmd.objects.get(id=last_agent_all_cmds.id).is_exec_error():
+                    time.sleep(0.5)
+                    current_wait_time+=0.5
+                    if max_wait_time <= current_wait_time:
+                        break 
+                return AgentCmd.objects.get(id=last_agent_all_cmds.id)
+            else:
+                return AgentCmd.objects.get(id=last_agent_all_cmds.id) 
+        else:
+            # There is no get_all_cmds for this agent in database, it's the first time we send this command, we have to wait until the command is executed.
             last_agent_all_cmds = AgentCmd.send_cmd_from_to("System",agent_name,"get_all_cmds")
-            max_wait_time = 3
-            current_wait_time = 0
             while not AgentCmd.objects.get(id=last_agent_all_cmds.id).is_executed() and not AgentCmd.objects.get(id=last_agent_all_cmds.id).is_exec_error():
-                time.sleep(0.5)
-                current_wait_time+=0.5
-                if max_wait_time <= current_wait_time:
-                    break 
-            return AgentCmd.objects.get(id=last_agent_all_cmds.id)
-        else:
-            return AgentCmd.objects.get(id=last_agent_all_cmds.id) 
-
+                    time.sleep(0.5)
 @login_required
 def agent_detail(request, agent_name):
     agent_log_path = os.path.join(os.environ.get("PROJECT_ROOT_PATH"),f"logs/{agent_name}/",f"{agent_name}.log")