Merge branch '2.4/dev' into funstuff

This commit is contained in:
Mike Reeves
2022-09-19 10:41:53 -04:00

View File

@@ -11,12 +11,11 @@
if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then
SOSTATUSLOG=/var/log/sostatus/status.log SOSTATUSLOG=/var/log/sostatus/status.log
SOSTATUSCODE=$(jq -r .status_code /var/log/sostatus/status.log) SOSTATUSCODE=$(jq -r .status_code $SOSTATUSLOG)
SOSTATUSJSON=$(cat /var/log/sostatus/status.log) SOSTATUSJSON=$(cat $SOSTATUSLOG | sed 's/"/\\"/g')
if [ -f "$SOSTATUSLOG" ]; then if [ -f "$SOSTATUSLOG" ]; then
echo "sostatus status=$SOSTATUSCODE" echo "sostatus status=$SOSTATUSCODE,json=\"$SOSTATUSJSON\""
echo "sostatus json=$SOSTATUSJSON"
else else
exit 0 exit 0
fi fi