Added management of CTRL-C interruption (kills thread before exiting)

Agent complet avec specific_process() exécuté au choix dans thread ou process (il suffit de mettre la constante RUN_IN_THREAD de AgentX à False ou True) (les commandes "abort" et "exit" sont correctement traitées dans les 2 cas) (NB: dans les 2 cas, la commande "exit" fait d'abord un "abort")

Added management of CTRL-C interruption (kills thread before exiting)
Agent complet avec specific_process() exécuté au choix dans thread ou process (il suffit de mettre la constante RUN_IN_THREAD de AgentX à False ou True) (les commandes "abort" et "exit" sont correctement traitées dans les 2 cas) (NB: dans les 2 cas, la commande "exit" fait d'abord un "abort")
Etienne Pallier
1 parent 75cb805d
Showing 3 changed files with 60 additions and 43 deletions Show diff stats
README.md
src/agent/Agent.py
src/agent/AgentX.py
@@ -71,9 +71,10 @@ Date: 11/03/2019
  
 Author: E. Pallier
  
-VERSION: 0.20.13
+VERSION: 0.20.14
  
-Comment: 
+Comment:
+	Added management of CTRL-C interruption (kills thread before exiting)
 	Agent complet avec specific_process() exécuté au choix dans thread ou process
 	(il suffit de mettre la constante RUN_IN_THREAD de AgentX à False ou True)
 	(les commandes "abort" et "exit" sont correctement traitées dans les 2 cas)
@@ -371,53 +371,61 @@ class Agent:
         # Main loop
         while True:
  
-            print()
-            print()
-            #print("-"*80)
-            print("-"*20, f"MAIN LOOP ITERATION {self._iter_num} (START)", "-"*20)
-            self.set_status(self.STATUS_MAIN_LOOP)
-            self.show_mode_and_status()
+            try:
  
-            self.load_config()
+                print()
+                print()
+                #print("-"*80)
+                print("-"*20, f"MAIN LOOP ITERATION {self._iter_num} (START)", "-"*20)
+                self.set_status(self.STATUS_MAIN_LOOP)
+                self.show_mode_and_status()
  
-            self.update_survey()
+                self.load_config()
  
-            if self.SIMULATOR_MODE: self.simulator_send_command_to_myself()
+                self.update_survey()
  
-            # generic cmd in json format
-            print("------START COMMMAND PROCESSING------")
-            cmd = self.get_next_valid_command()
+                if self.SIMULATOR_MODE: self.simulator_send_command_to_myself()
  
-            if cmd: cmd = self.general_process(cmd)
-            '''
-            if self.config.majordome_state == "STOP":
-                break
-            if self.config.majordome_state == "RESTART":
-                self.config.majordome_restarted = True
-                self.closing_mode = self.config.majordome_state
-                self.config.majordome_state = "RUNNING"
-                self.config.save()
-            '''
+                # generic cmd in json format
+                print("------START COMMMAND PROCESSING------")
+                cmd = self.get_next_valid_command()
  
-            self.routine_process()
+                if cmd: cmd = self.general_process(cmd)
+                '''
+                if self.config.majordome_state == "STOP":
+                    break
+                if self.config.majordome_state == "RESTART":
+                    self.config.majordome_restarted = True
+                    self.closing_mode = self.config.majordome_state
+                    self.config.majordome_state = "RUNNING"
+                    self.config.save()
+                '''
  
-            # Sub-level loop (only if ACTIVE)
-            if self.is_active():
-                if cmd: self.specific_process(cmd)
-            print("------END COMMMAND PROCESSING------")
+                self.routine_process()
  
-            # Every N iterations, delete old commands
-            N=3
-            if ((self._iter_num-1) % N) == 0: Command.purge_old_commands_for_agent(self.name)
+                # Sub-level loop (only if ACTIVE)
+                if self.is_active():
+                    if cmd: self.specific_process(cmd)
+                print("------END COMMMAND PROCESSING------")
  
-            self.waitfor(self.mainloop_waittime)
+                # Every N iterations, delete old commands
+                N=3
+                if ((self._iter_num-1) % N) == 0: Command.purge_old_commands_for_agent(self.name)
  
-            print("-"*20, "MAIN LOOP ITERATION (END)", "-"*20)
-            #print("-"*80)
+                self.waitfor(self.mainloop_waittime)
  
-            #self.do_log(LOG_DEBUG, "Ending main loop iteration")
+                print("-"*20, "MAIN LOOP ITERATION (END)", "-"*20)
+                #print("-"*80)
  
-            self._iter_num += 1
+                #self.do_log(LOG_DEBUG, "Ending main loop iteration")
+
+                self._iter_num += 1
+
+            except KeyboardInterrupt:
+                # In case of CTRL-C, kill the current thread (process) before dying (in error)
+                print("CTRL-C Interrupted, I kill the current thread (process) before exiting")
+                self.kill_running_specific_cmd_if_exists()
+                exit(1)
  
  
  
@@ -577,10 +585,14 @@ class Agent:
     def update_survey(self):
         print("Updating the survey database table...")
         print("- fetching table line for agent", self.name)
-        self._agent_survey = AgentSurvey.objects.get(name=self.name)
-        self._agent_survey.mode = self.mode
-        self._agent_survey.status = self.status
-        self._agent_survey.save()
+        # only necessary when using process (not necessary with threads)
+        with transaction.atomic():
+            self._agent_survey = AgentSurvey.objects.get(name=self.name)
+            self._agent_survey.mode = self.mode
+            self._agent_survey.status = self.status
+            # Optimization: update only the related fields
+            #self._agent_survey.save()
+            self._agent_survey.save(update_fields=["mode", "status"])
  
  
     def simulator_send_command_to_myself(self):
@@ -809,7 +821,10 @@ class Agent:
         self.exec_specific_cmd_main(cmd)
         # thread execution tearing down
         self.exec_specific_cmd_end(cmd)
-
+        '''
+        except TimeoutError:
+            pass
+        '''
  
     def exec_specific_cmd_start(self, cmd:Command):
         """ specific command execution setting up """
@@ -16,7 +16,7 @@ log = L.setupLogger(&quot;AgentXTaskLogger&quot;, &quot;AgentX&quot;)
  
 class AgentX(Agent):
  
-    """ 
+    """
     How to run this agent exec_specific_cmd() method ?
     - True = inside a Thread (cannot be killed, must be asked to stop, and inadequate for computation)
     - False = inside a Process
@@ -40,6 +40,7 @@ class AgentX(Agent):
         >>>>> Thread: PID: 2690, Process Name: Process-3, Thread Name: MainThread
     """
     RUN_IN_THREAD = True
+    #RUN_IN_THREAD = False
  
  
     """