Small refactor for repeated code

Author: Nathan Lee

pyrunner/core/engine.py

@@ -171,7 +171,7 @@ def initiate(self, **kwargs):
 
   def _abort_all_workers(self):
     for node in self.register.running_nodes.copy():
-      node.terminate()
+      node.terminate('Keyboard Interrupt (SIGINT) received. Terminating Worker and exiting.')
       self.register.running_nodes.remove(node)
       self.register.aborted_nodes.add(node)
       self.register.set_children_defaulted(node)

pyrunner/core/node.py

@@ -146,33 +146,28 @@ def poll(self, wait=False):
         retcode = -1
       self.cleanup()
     elif (time.time() - self._start_time) >= self._timeout:
-      self._proc.terminate()
+      retcode = self.terminate('Worker runtime has exceeded the set maximum/timeout of {} seconds.'.format(self._timeout))
       running = False
-      logger = lg.FileLogger(self.logfile)
-      logger.open(False)
-      logger.error('Worker runtime has exceeded the set maximum/timeout of {} seconds.'.format(self._timeout))
-      logger.close()
-      self.cleanup()
-      retcode = 906
 
     return retcode if (not running or wait) else None
 
-  def terminate(self):
+  def terminate(self, message='Terminating process'):
     """
     Immediately terminates the Worker, if running.
     """
     if self._proc.is_alive():
       self._proc.terminate()
       logger = lg.FileLogger(self.logfile)
       logger.open(False)
-      logger._system_("Keyboard Interrupt (SIGINT) received. Terminating Worker and exiting.")
+      logger._system_(message)
       logger.close()
     self.cleanup()
     return 907
 
   def cleanup(self):
     self._proc = None
     self._context = None
+    self._worker_instance = None
 
 
   # ########################## MISC ########################## #