From: Siraaj Khandkar <siraaj@khandkar.net>
Date: Mon, 13 Aug 2018 19:43:06 +0000 (-0400)
Subject: Clear MPD state on non-0 exit from MPD song sensor
X-Git-Url: https://git.xandkar.net/?a=commitdiff_plain;h=7a2b16ba7175f07e0ae54e0527475c75e8cc1210;p=khatus.git

Clear MPD state on non-0 exit from MPD song sensor

This is only half-arse general solution - while it catches and propagates non-0
exits for all sensors, not all sensors will actually propagate failures from
middles of their pipelines; and controller only handles the mpd case here.

The right thing to do seems to be to save the current timestamp value and
mark every key in the db with it, then only use values that are fresh-enough.
This needs a re-organization of how values are formatted by the sensors and
stored by the controller.

For error-handling we need to enable pipefail option on all sensor scripts,
but, how to parse and handle errors _well_? It seems that shell/awk are no
longer an advantage...
---

diff --git a/bin/khatus b/bin/khatus
index 8fd094f..bbc7ab8 100755
--- a/bin/khatus
+++ b/bin/khatus
@@ -49,6 +49,11 @@ run_producer() {
         do
             echo "OK ${msg_head} $line" > "$pipe"
         done
+    cmd_exit_code=${PIPESTATUS[0]}
+    if [ "$cmd_exit_code" -ne 0 ]
+    then
+        echo "ERROR ${msg_head} NON_ZERO_EXIT_CODE $cmd_exit_code" > "$pipe"
+    fi
 }
 
 fork_watcher() {
diff --git a/bin/khatus_controller b/bin/khatus_controller
index c4a6cfd..72136d0 100755
--- a/bin/khatus_controller
+++ b/bin/khatus_controller
@@ -2,6 +2,15 @@
 
 /^OK/ { debug("OK line", $0) }
 
+/^ERROR in:MPD.*NON_ZERO_EXIT_CODE/ {
+    for (mpd_key in db) {
+        if (mpd_key ~ "^mpd_") {
+            delete db[mpd_key]
+        }
+    }
+    next
+}
+
 /^ERROR/ {
     debug("ERROR line", $0)
     shift()