Adding pyros stop command, improving do_things_before_exit of agentSST

Alexis Koralewski
1 parent 371e91c2
Showing 4 changed files with 28 additions and 21 deletions Show diff stats
VERSION
pyros.py
src/core/pyros_django/agent/AgentSST.py
src/core/pyros_django/pyros/settings.py
-0.4.10.0
 \ No newline at end of file
+0.4.12.0
 \ No newline at end of file
@@ -81,7 +81,6 @@ AGENTS = {
 }
 # AGENTS = ["agentX", "webserver", "monitoring", "majordome", "scheduler", "alert_manager"]
 # AGENTS = ["all", "webserver", "monitoring", "majordome", "scheduler", "alert"]
-
 # COMMANDS = {"install": [], "start": AGENTS, "stop": AGENTS}
  
 REQUIREMENTS = 'requirements.txt'
@@ -1156,14 +1155,18 @@ def new_start(configfile: str, observatory: str, unit: str, computer_hostname: s
     # return True if p.returncode==0 else False
     return True if p.returncode == 0 else False
  
-# TODO: implémenter le STOP !!!
-@pyros_launcher.command(help="Kill an agent")
-@click.argument('agent')
-def stop(agent):
+@pyros_launcher.command(help="Stop pyros")
+def stop():
     print("Running stop command")
-    if not _check_agent(agent):
-        return
-
+    try:
+        for line in os.popen("ps ax | grep " + "AgentSST" + " | grep -v grep"):
+            fields = line.split()
+            pid = fields[0]
+            # terminating process
+            os.kill(int(pid), signal.SIGINT)
+         
+    except:
+        print("Error Encountered while try to kill agentSST")
  
 """
 ********************************************************************************
@@ -135,24 +135,28 @@ class AgentSST(Agent):
         #     log.debug(f"Agent {agent} failed to restart")
  
     def force_kill_agent(self, *args)->None:
-        if agent in self.subprocess_dict.get(agent) is not None:
-            process = self.subprocess_dict.get(agent)
-            process.terminate()
-            process.wait()
-            if process.poll() is not None:
-                pass
-                #cmd.set_as_processed()
-        else:
-            return None
+        if args:
+            agent = args[0]
+            if self.subprocess_dict.get(agent) is not None:
+                process = self.subprocess_dict.get(agent)
+                # process.terminate()
+                # process.wait()
+                # Kill is better when using Popen(shell=True) because it will remove the created child process
+                process.kill()
+            else:
+                return None
  
     def do_things_before_exit(self,abort_cmd_sender):
         kill_agent_commands = {}
         for agent in self.subprocess_dict.keys():
             cmd = self.kill_agent(agent)    
             kill_agent_commands[agent] = cmd
+        # wait 10 seconds in order to agents to exit themselves properly 
+        time.sleep(10)
+        
         for agent in kill_agent_commands:
-            if self.subprocess_dict[agent].poll() is None:
-                self.force_kill_agent(kill_agent_commands[agent],agent)
+            while self.subprocess_dict[agent].poll() is None:
+                time.sleep(0.5)
  
     def routine_process_before_body(self):
         now_time = datetime.now(timezone.utc) 
@@ -471,7 +471,7 @@ EMAIL_BACKEND = &#39;django.core.mail.backends.console.EmailBackend&#39;
  
 python_version = subprocess.run( "python --version | cut -d ' ' -f 2 | cut -d '.' -f 1,2",shell=True,stdout=subprocess.PIPE,universal_newlines=True)
 python_version = python_version.stdout
-day = "2022-06-01"
+day = "2022-06-03"
 django_version_major,django_version_minor = django.VERSION[:2][0],django.VERSION[:2][1] 
 pyros_version = read_version_number_from_file(f"{BASE_DIR}/../../../VERSION")