sermoni

commit a19c89902fd32b8a7d1bfe1af856786d8a7499cf
parent b8ff092a071cbfdb50074bf187d02e7e79289b4a
Author: Vetle Haflan <vetle@haflan.dev>
Date:   Mon,  3 Aug 2020 00:14:31 +0200

Add sermonic.sh WIP (#14)

Diffstat:
A
sermonic.sh
 | 
83
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
ui/src/Events.vue
 | 
4
+---

2 files changed, 84 insertions(+), 3 deletions(-)
diff --git a/sermonic.sh b/sermonic.sh
@@ -0,0 +1,83 @@
+# "sermonicronic" report 
+# SYNTAX
+#   sermonic backup-service /full/path/to/backup-service.sh
+# BEHAVIOR
+#   - On success, inlude last 10 or so lines of output (for info about files written etc)
+#     OR might want to make that the responsibility of the script being called.
+#   - On error, format the details like cronic does
+
+# Based on CRONIC
+# | Cronic v3 - cron job report wrapper
+# | Copyright 2007-2016 Chuck Houpt. No rights reserved, whatsoever.
+# | Public Domain CC0: http://creativecommons.org/publicdomain/zero/1.0/
+
+set -e
+
+SERVICEID=$1
+TMP=$(mktemp -d)
+OUT=$TMP/sermonic.out
+ERR=$TMP/sermonic.err
+TRACE=$TMP/sermonic.trace
+FULLDETAILS=$TMP/sermonic.details
+
+out() {
+    echo "$@" >> $FULLDETAILS
+}
+
+json_escape () {
+    printf '%s' "$1" | python -c 'import json,sys; print(json.dumps(sys.stdin.read()))'
+}
+
+
+set +e
+# Run all args after first
+"${@:2}" >$OUT 2>$TRACE
+RESULT=$?
+set -e
+
+# This is just to remove the debug output prefix, I think
+PATTERN="^${PS4:0:1}\\+${PS4:1}"
+if grep -aq "$PATTERN" $TRACE
+then
+    ! grep -av "$PATTERN" $TRACE > $ERR
+else
+    ERR=$TRACE
+fi
+
+if [ $RESULT -ne 0 -o -s "$ERR" ]; then
+    out sermonic detected failure or error output for the service \'$1\'
+    out
+    out FULL COMMAND:
+    out ${@:2}
+    out
+    out RESULT CODE:
+    out $RESULT
+    out
+    out ERROR OUTPUT:
+    out $(cat "$ERR")
+    out
+    out STANDARD OUTPUT:
+    out $(cat "$OUT")
+    if [ $TRACE != $ERR ]
+    then
+        out
+        out "TRACE-ERROR OUTPUT:"
+        out $(cat "$TRACE")
+    fi
+    details=$(json_escape "$(cat $FULLDETAILS)")
+    status=error
+else
+    details=$(json_escape "$(cat $OUT)")
+    status=ok
+fi
+
+echo "$json"
+
+rm -rf "$TMP"
+
+# Consider moving this part to dedicated smreport script:
+sermoni=http://localhost:8080
+token="$(cat $HOME/.sermoni-token):$SERVICEID"
+JSONDATA="{\"status\": \"$status\", \"title\": \"$title\", \"details\": $details}"
+echo "$JSONDATA"
+curl -H "Service-Token: $token" -d "$JSONDATA" $sermoni/events
diff --git a/ui/src/Events.vue b/ui/src/Events.vue
@@ -13,9 +13,7 @@
                 <button v-show="e.id > 0" @click="deleteEvent(e.id)">&times;</button>
             </div>
             <div v-show="e.open" style="padding: 5px; border: 1px solid rgba(0,0,0,.125); border-top: 0">
-                <code>
-                    {{e.details}}
-                </code>
+                <code style="white-space:pre;">{{e.details}}</code>
             </div>
         </div>
     </div>