add quit method

Author: PeterKraus

src/tomato/daemon/driver.py

@@ -310,8 +310,8 @@ def tomato_driver() -> None:
         logger.critical("uncaught exception %s", type(e), exc_info=True)
         raise e
 
-    logger.info("driver '%s' is beginning reset", args.driver)
-    interface.reset()
+    logger.info("driver '%s' is beginning to quit", args.driver)
+    interface.quit()
 
     logger.info("driver '%s' is quitting", args.driver)
 

src/tomato/driverinterface_2_0/__init__.py

@@ -477,6 +477,12 @@ def status(self) -> Reply:
             data=devkeys,
         )
 
+    def quit(self) -> Reply:
+        """
+        Passthrough to :func:`reset` for foward compatibility.
+        """
+        return self.reset()
+
     @log_errors
     def reset(self) -> Reply:
         """

src/tomato/driverinterface_2_1/__init__.py

@@ -432,6 +432,12 @@ def status(self) -> Reply:
             data=devkeys,
         )
 
+    def quit(self) -> Reply:
+        """
+        Passthrough to :func:`reset` for foward compatibility.
+        """
+        return self.reset()
+
     @log_errors
     def reset(self) -> Reply:
         """
@@ -444,15 +450,10 @@ def reset(self) -> Reply:
         """
         logger.info("resetting all components on this driver")
         for key, dev in self.devmap.items():
-            if dev.thread.is_alive():
-                logger.warning("stopping task on component %s", key)
-                setattr(dev.thread, "do_run", False)
-                dev.thread.join(timeout=1)
-            if dev.thread.is_alive():
-                logger.error("task on component %s is still running", key)
-            else:
-                logger.debug("component %s has no running task", key)
-            self.cmp_reset(key=key)
+            logger.warning("stopping task on component %s", key)
+            self.task_stop(key=key)
+            logger.warning("resetting component %s", key)
+            self.cmp_reset(key=key, do_run=False)
         return Reply(
             success=True,
             msg="all components on driver have been reset",
@@ -498,7 +499,7 @@ def __init__(self, driver, key, **kwargs) -> None:
         self.driver = driver
         self.key = key
         self.task_list = queue.Queue()
-        self.thread = Thread(target=self.task_runner, daemon=False)
+        self.thread = Thread(target=self.task_runner, daemon=True)
         self.thread.do_run = True
         self.thread.do_run_task = False
         self.thread.start()
@@ -534,9 +535,10 @@ def task_runner(self) -> None:
 
             self.running = task
             try:
+                thread.do_run_task = False
                 if isinstance(task, Task):
-                    thread.do_run_task = True
                     self.prepare_task(task=task)
+                    thread.do_run_task = True
                     t_0 = time.perf_counter()
                     t_p = t_0
                     self.data = None
@@ -684,7 +686,7 @@ def reset(self, do_run: bool = True, **kwargs) -> None:
         self.data = None
         self.datalock = RLock()
         self.task_list = queue.Queue()
-        self.thread = Thread(target=self.task_runner, daemon=False)
+        self.thread = Thread(target=self.task_runner, daemon=True)
         self.thread.do_run = do_run
         self.thread.do_run_task = False
         self.thread.start()