Add keep_alive property to collect_logs (#2533) (#2535)

(cherry picked from commit 47770b7)

azurelinuxagent/common/interfaces.py

@@ -30,6 +30,15 @@ def get_thread_name():
     def run(self):
         raise NotImplementedError("run() not implemented")
 
+    def keep_alive(self):
+        """
+        Returns true if the thread handler should be restarted when the thread dies
+        and false when it should remain dead.
+        
+        Defaults to True and can be overridden by sub-classes.
+        """
+        return True
+
     def is_alive(self):
         raise NotImplementedError("is_alive() not implemented")
 

azurelinuxagent/ga/collect_logs.py

@@ -107,6 +107,9 @@ def __init__(self):
     def run(self):
         self.start()
 
+    def keep_alive(self):
+        return self.should_run
+
     def is_alive(self):
         return self.event_thread.is_alive()
 

azurelinuxagent/ga/update.py

@@ -450,7 +450,7 @@ def _check_daemon_running(self, debug):
     def _check_threads_running(self, all_thread_handlers):
         # Check that all the threads are still running
         for thread_handler in all_thread_handlers:
-            if not thread_handler.is_alive():
+            if thread_handler.keep_alive() and not thread_handler.is_alive():
                 logger.warn("{0} thread died, restarting".format(thread_handler.get_thread_name()))
                 thread_handler.start()