From 03536a69c9a631dd6cebe4f8e0ae1b49bcaecce8 Mon Sep 17 00:00:00 2001
From: Keith Whyte <keith@rhizomatica.org>
Date: Wed, 24 Feb 2021 06:33:04 +0100
Subject: [PATCH] Improve on last commit

Use runit custom control scripts to end child processes
---
 modules/rhizo_base/files/etc/sv/meas-json/control/t | 3 +++
 modules/rhizo_base/files/etc/sv/meas-json/run       | 6 +-----
 modules/rhizo_base/files/etc/sv/meas-json/scr       | 3 ---
 3 files changed, 4 insertions(+), 8 deletions(-)
 create mode 100755 modules/rhizo_base/files/etc/sv/meas-json/control/t
 delete mode 100755 modules/rhizo_base/files/etc/sv/meas-json/scr

diff --git a/modules/rhizo_base/files/etc/sv/meas-json/control/t b/modules/rhizo_base/files/etc/sv/meas-json/control/t
new file mode 100755
index 0000000..ce4b64c
--- /dev/null
+++ b/modules/rhizo_base/files/etc/sv/meas-json/control/t
@@ -0,0 +1,3 @@
+#!/bin/bash
+pkill -P `cat /etc/sv/meas-json/supervise/pid`
+exit 0
diff --git a/modules/rhizo_base/files/etc/sv/meas-json/run b/modules/rhizo_base/files/etc/sv/meas-json/run
index bd9d9c7..9981ce6 100755
--- a/modules/rhizo_base/files/etc/sv/meas-json/run
+++ b/modules/rhizo_base/files/etc/sv/meas-json/run
@@ -1,10 +1,6 @@
 #!/bin/bash
 exec 2>&1
-
 if [ -a /tmp/json_socket ]; then
-  killall ncat
-  killall meas_json
   rm -f /tmp/json_socket
 fi
-
-exec /etc/sv/meas-json/scr | ncat -l -U /tmp/json_socket -k --send-only
+exec chpst -P /bin/sh -c '/usr/bin/stdbuf -oL /usr/bin/meas_json | ncat -l -U /tmp/json_socket -k --send-only'
diff --git a/modules/rhizo_base/files/etc/sv/meas-json/scr b/modules/rhizo_base/files/etc/sv/meas-json/scr
deleted file mode 100755
index e46c9c8..0000000
--- a/modules/rhizo_base/files/etc/sv/meas-json/scr
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-exec 2>&1
-exec /usr/bin/stdbuf -oL /usr/bin/meas_json