From 515d8196f60a0f13df532a538189caa45e590921 Mon Sep 17 00:00:00 2001 From: Martin Valov Date: Sun, 22 Nov 2020 21:53:40 +0100 Subject: [PATCH] Added the enabled true|false flag in mqtt.json --- config/mqtt.json | 1 + sources/inverter-mqtt/mqtt-push.sh | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/config/mqtt.json b/config/mqtt.json index 787e533..f810eb7 100644 --- a/config/mqtt.json +++ b/config/mqtt.json @@ -6,6 +6,7 @@ "username": "", "password": "", "influx": { + "enabled": "true", "host": "http://[INFLUX_IP_OR_URL]:8086", "username": "", "password": "", diff --git a/sources/inverter-mqtt/mqtt-push.sh b/sources/inverter-mqtt/mqtt-push.sh index cf8936c..89bbb81 100755 --- a/sources/inverter-mqtt/mqtt-push.sh +++ b/sources/inverter-mqtt/mqtt-push.sh @@ -1,10 +1,5 @@ #!/bin/bash -INFLUX_HOST=`cat /etc/inverter/mqtt.json | jq '.influx.host' -r` -if [[ -n $INFLUX_HOST ]]; then - INFLUX_ENABLED=true -else - INFLUX_ENABLED=false -fi +INFLUX_ENABLED=`cat /etc/inverter/mqtt.json | jq '.influx.enabled' -r` pushMQTTData () { MQTT_SERVER=`cat /etc/inverter/mqtt.json | jq '.server' -r` @@ -22,7 +17,7 @@ pushMQTTData () { -t "$MQTT_TOPIC/sensor/"$MQTT_DEVICENAME"_$1" \ -m "$2" - if "$INFLUX_ENABLED"; then + if [[$INFLUX_ENABLED == "true"]] ; then pushInfluxData $1 $2 fi }