From 48894f6ad4f3c9a2d0255fed881fffc7ac1e1c33 Mon Sep 17 00:00:00 2001
From: CamDavidsonPilon <cam.davidson.pilon@gmail.com>
Date: Wed, 16 Nov 2022 11:07:33 -0500
Subject: [PATCH] pio kill --all-jobs should kill pumps too

---
 pioreactor/cli/pio.py        | 34 +++++++++++++++++++++++++++++-----
 pioreactor/utils/__init__.py |  4 ++--
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/pioreactor/cli/pio.py b/pioreactor/cli/pio.py
index 33dc9b0c..39297d7f 100644
--- a/pioreactor/cli/pio.py
+++ b/pioreactor/cli/pio.py
@@ -2,9 +2,8 @@
 """
 cmd line interface for running individual pioreactor units (including leader)
 
-> pio run od_reading
 > pio run stirring --ignore-rpm
-> pio log
+> pio logs
 """
 from __future__ import annotations
 
@@ -167,7 +166,15 @@ def led_off() -> None:
 @click.option("--all-jobs", is_flag=True, help="kill all Pioreactor jobs running")
 def kill(job: list[str], all_jobs: bool) -> None:
     """
-    stop a job by sending a SIGTERM to it.
+    stop a job(s).
+    """
+    """
+    This isn't a very clean way to end jobs (generally: actions). Ex: If a python script is running with Pioreactor jobs
+    running in it, it won't get closed.
+
+    Another approach is to iterate through /tmp/jon_metadata_*.db and fire an MQTT event to kill them. This would fail though if
+    not connected to leader...
+
     """
 
     from sh import pkill  # type: ignore
@@ -180,8 +187,25 @@ def safe_pkill(*args: str) -> None:
             pass
 
     if all_jobs:
+        # kill all running pioreactor processes
         safe_pkill("-f", "pio run ")
-        sleep(1)
+
+        # kill all pumping
+        pubsub.publish(
+            f"pioreactor/{whoami.UNIVERSAL_IDENTIFIER}/{whoami.UNIVERSAL_EXPERIMENT}/add_media/$state/set",
+            "disconnected",
+        )
+        pubsub.publish(
+            f"pioreactor/{whoami.UNIVERSAL_IDENTIFIER}/{whoami.UNIVERSAL_EXPERIMENT}/remove_waste/$state/set",
+            "disconnected",
+        )
+        pubsub.publish(
+            f"pioreactor/{whoami.UNIVERSAL_IDENTIFIER}/{whoami.UNIVERSAL_EXPERIMENT}/add_alt_media/$state/set",
+            "disconnected",
+        )
+
+        # kill all LEDs
+        sleep(0.5)
         led_intensity({"A": 0, "B": 0, "C": 0, "D": 0}, verbose=False)
     else:
         for j in job:
@@ -393,8 +417,8 @@ def update(ui: bool, app: bool, branch: Optional[str], source: Optional[str]) ->
     run.add_command(jobs.led_control.click_led_control)
     run.add_command(jobs.temperature_control.click_temperature_control)
 
-    run.add_command(actions.pump.click_add_alt_media)
     run.add_command(actions.led_intensity.click_led_intensity)
+    run.add_command(actions.pump.click_add_alt_media)
     run.add_command(actions.pump.click_add_media)
     run.add_command(actions.pump.click_remove_waste)
     run.add_command(actions.od_blank.click_od_blank)
diff --git a/pioreactor/utils/__init__.py b/pioreactor/utils/__init__.py
index 61a4470f..c461e0c4 100644
--- a/pioreactor/utils/__init__.py
+++ b/pioreactor/utils/__init__.py
@@ -66,9 +66,9 @@ def append_signal_handlers(signal_value: signal.Signals, new_callbacks: list[Cal
 
 class publish_ready_to_disconnected_state:
     """
-    Wrap a block of code to have "state" in MQTT. See od_normalization, self_test.
+    Wrap a block of code to have "state" in MQTT. See od_normalization, self_test, pump
 
-    You can use MQTT "/$state/set" tools to disconnect it.
+    You can use MQTT ".../$state/set" tools to disconnect it.
 
     Example
     ----------