From 7a32d403594cc742f841cdb6c70f079d6c22700a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Mon, 1 Nov 2021 21:39:12 +0100 Subject: [PATCH] Updated vhost{1, 2}.in (updated temperature.sh to handle stop messages correctly). --- sources/vhost1.in/root/temperature.sh | 26 ++++++++++++-------------- sources/vhost2.in/root/temperature.sh | 26 ++++++++++++-------------- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/sources/vhost1.in/root/temperature.sh b/sources/vhost1.in/root/temperature.sh index 33f2993..d71a804 100755 --- a/sources/vhost1.in/root/temperature.sh +++ b/sources/vhost1.in/root/temperature.sh @@ -162,7 +162,7 @@ process_received_smses() { --silent \ --data "1201001" \ http://$MODEM_IP/api/sms/sms-list \ - > /tmp/received_smses.txt + > /tmp/received_smses.txt grep -i 'Stop' /tmp/received_smses.txt \ | while read LINE do @@ -253,21 +253,19 @@ send_stop_sms() { STR_DATE=$(date) + if [ ! -f $SCRIPT_STOP ] + then + return + fi RECEIVED_SMS_COUNT=$(grep '' /tmp/received_smses.txt \ | sed 's|^.*\([0-9]*\).*$|\1|') if [ $RECEIVED_SMS_COUNT -lt 1 ] then - return + return fi STOP_NUMBER=$(grep '' /tmp/received_smses.txt \ | sed 's/.*\(.*\)<\/Phone>.*$/\1/') - if [ -f $SCRIPT_STOP ] - then - SEND_STATUS="does NOT" - else - SEND_STATUS="DOES" - fi - MESSAGE="Stopped by ${STOP_NUMBER}, ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system $SEND_STATUS send SMSs." + MESSAGE="Stopped by ${STOP_NUMBER}, ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system does NOT send SMSs for the next 24 hours." SMS_TARGETS="" i=0 while [ $i -lt $NUMBER_OF_PHONES ] @@ -342,18 +340,18 @@ shutdown_hosts() { if [ $SEVERITY -le 1 ] then echo "shutting down store.in.useribm.hu" >>/var/log/temperature-script-${PRG_DATE}.log - ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 store.in.useribm.hu poweroff + ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 store.in.useribm.hu poweroff echo "shutting down tsm.in.useribm.hu" >>/var/log/temperature-script-${PRG_DATE}.log - ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 tsm.in.useribm.hu poweroff + ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 tsm.in.useribm.hu poweroff fi if [ $SEVERITY -gt 1 ] then echo "shutting down aiac922.in.useribm.hu" >>/var/log/temperature-script-${PRG_DATE}.log - ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 aiac922.in.useribm.hu poweroff + ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 aiac922.in.useribm.hu poweroff echo "shutting down store.in.useribm.hu" >>/var/log/temperature-script-${PRG_DATE}.log - ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 store.in.useribm.hu poweroff + ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 store.in.useribm.hu poweroff echo "shutting down tsm.in.useribm.hu" >>/var/log/temperature-script-${PRG_DATE}.log - ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 tsm.in.useribm.hu poweroff + ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 tsm.in.useribm.hu poweroff fi } diff --git a/sources/vhost2.in/root/temperature.sh b/sources/vhost2.in/root/temperature.sh index 33f2993..d71a804 100755 --- a/sources/vhost2.in/root/temperature.sh +++ b/sources/vhost2.in/root/temperature.sh @@ -162,7 +162,7 @@ process_received_smses() { --silent \ --data "1201001" \ http://$MODEM_IP/api/sms/sms-list \ - > /tmp/received_smses.txt + > /tmp/received_smses.txt grep -i 'Stop' /tmp/received_smses.txt \ | while read LINE do @@ -253,21 +253,19 @@ send_stop_sms() { STR_DATE=$(date) + if [ ! -f $SCRIPT_STOP ] + then + return + fi RECEIVED_SMS_COUNT=$(grep '' /tmp/received_smses.txt \ | sed 's|^.*\([0-9]*\).*$|\1|') if [ $RECEIVED_SMS_COUNT -lt 1 ] then - return + return fi STOP_NUMBER=$(grep '' /tmp/received_smses.txt \ | sed 's/.*\(.*\)<\/Phone>.*$/\1/') - if [ -f $SCRIPT_STOP ] - then - SEND_STATUS="does NOT" - else - SEND_STATUS="DOES" - fi - MESSAGE="Stopped by ${STOP_NUMBER}, ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system $SEND_STATUS send SMSs." + MESSAGE="Stopped by ${STOP_NUMBER}, ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system does NOT send SMSs for the next 24 hours." SMS_TARGETS="" i=0 while [ $i -lt $NUMBER_OF_PHONES ] @@ -342,18 +340,18 @@ shutdown_hosts() { if [ $SEVERITY -le 1 ] then echo "shutting down store.in.useribm.hu" >>/var/log/temperature-script-${PRG_DATE}.log - ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 store.in.useribm.hu poweroff + ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 store.in.useribm.hu poweroff echo "shutting down tsm.in.useribm.hu" >>/var/log/temperature-script-${PRG_DATE}.log - ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 tsm.in.useribm.hu poweroff + ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 tsm.in.useribm.hu poweroff fi if [ $SEVERITY -gt 1 ] then echo "shutting down aiac922.in.useribm.hu" >>/var/log/temperature-script-${PRG_DATE}.log - ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 aiac922.in.useribm.hu poweroff + ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 aiac922.in.useribm.hu poweroff echo "shutting down store.in.useribm.hu" >>/var/log/temperature-script-${PRG_DATE}.log - ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 store.in.useribm.hu poweroff + ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 store.in.useribm.hu poweroff echo "shutting down tsm.in.useribm.hu" >>/var/log/temperature-script-${PRG_DATE}.log - ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 tsm.in.useribm.hu poweroff + ssh -i $SSH_KEYS_PATH/scripts -l root -o ConnectTimeout=1 tsm.in.useribm.hu poweroff fi } -- 2.54.0