From 4378316bcb7bbd00f745cab181ab5a2aaadf80fe Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 12 Sep 2022 22:04:40 -0500 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index 710d9cef..5b63e87d 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -190,21 +190,15 @@ POWERLOGGER_SERVICE(){ inA=$(curl -s "http://10.10.0.61/stats.json" | jq '.inputs .inA') battV=$(curl -s "http://10.10.0.61/stats.json" | jq '.inputs .battV') battA=$(curl -s "http://10.10.0.61/stats.json" | jq '.inputs .xfA') - - QRY="USE servermonitor; INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('2','${datetime}','${inV}','${inA}')" - #${mysql_conn} -e "${QRY}" - QRY="${QRY}; INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('3','${datetime}','${outV}','${outA}')" - #${mysql_conn} -e "${QRY}" - QRY="${QRY}; INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('4','${datetime}','${battV}','${battA}')" - #${mysql_conn} -e "${QRY}" - JSONSTATS=$(curl -s "http://10.10.0.61/stats.json") + + QRY="USE servermonitor; INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('2','${datetime}','${inV}','${inA}')" + QRY="${QRY}; INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('3','${datetime}','${outV}','${outA}')" + QRY="${QRY}; INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('4','${datetime}','${battV}','${battA}')" QRY="${QRY}; INSERT INTO inv_jsonstats (\`date\`, \`data\`) VALUES ('${datetime}','${JSONSTATS}')" - echo $QRY + ${mysql_conn} -e "${QRY}" - - - + sleep 1m done @@ -216,7 +210,6 @@ UPDATE_SERVICES(){ done sleep 5s for srvc in "${POWERWALL_SERVICES[@]}"; do - echo /bin/systemctl start $srvc done } @@ -225,6 +218,11 @@ STOPALL_SERVICES(){ /bin/systemctl stop $srvc done } +STARTALL_SERVICES(){ + for srvc in "${POWERWALL_SERVICES[@]}"; do + /bin/systemctl stop $srvc + done +} STOP_SERVICE(){ echo "stop: ${1}" @@ -268,6 +266,7 @@ SHUTDOWN_SERVERS(){ if [ ${action-x} ]; then case $action in stopall) STOPALL_SERVICES;; + startall) STARTALL_SERVICES;; updateservices) UPDATE_SERVICES;; checktemp) CHECKTEMP ${2};; checktemp_service)