Updated vhost{1, 2}.in (updated temperature.sh to handle stop messages correctly).

diff --git a/sources/vhost1.in/root/temperature.sh b/sources/vhost1.in/root/temperature.sh
index 33f2993e101c3c9d2e754f321842646c5a0a5109..d71a80416c92842a2e7ca843f1b6f0bdf570b40a 100755 (executable)
--- a/sources/vhost1.in/root/temperature.sh
+++ b/sources/vhost1.in/root/temperature.sh
@@ -162,7 +162,7 @@ process_received_smses() {
          --silent \
          --data "<?xml version='1.0' encoding='UTF-8'?><request><PageIndex>1</PageIndex><ReadCount>20</ReadCount><BoxType>1</BoxType><SortType>0</SortType><Ascending>0</Ascending><UnreadPreferred>1</UnreadPreferred></request>" \
          http://$MODEM_IP/api/sms/sms-list \
-        > /tmp/received_smses.txt
+         > /tmp/received_smses.txt
     grep -i '<Content>Stop</Content>' /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 '<Count>' /tmp/received_smses.txt \
                              | sed 's|^.*<Count>\([0-9]*\)</Count>.*$|\1|')
     if [ $RECEIVED_SMS_COUNT -lt 1 ]
     then
-       return
+        return
     fi
     STOP_NUMBER=$(grep '<Phone>' /tmp/received_smses.txt \
                       | sed 's/.*<Phone>\(.*\)<\/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 33f2993e101c3c9d2e754f321842646c5a0a5109..d71a80416c92842a2e7ca843f1b6f0bdf570b40a 100755 (executable)
--- a/sources/vhost2.in/root/temperature.sh
+++ b/sources/vhost2.in/root/temperature.sh
@@ -162,7 +162,7 @@ process_received_smses() {
          --silent \
          --data "<?xml version='1.0' encoding='UTF-8'?><request><PageIndex>1</PageIndex><ReadCount>20</ReadCount><BoxType>1</BoxType><SortType>0</SortType><Ascending>0</Ascending><UnreadPreferred>1</UnreadPreferred></request>" \
          http://$MODEM_IP/api/sms/sms-list \
-        > /tmp/received_smses.txt
+         > /tmp/received_smses.txt
     grep -i '<Content>Stop</Content>' /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 '<Count>' /tmp/received_smses.txt \
                              | sed 's|^.*<Count>\([0-9]*\)</Count>.*$|\1|')
     if [ $RECEIVED_SMS_COUNT -lt 1 ]
     then
-       return
+        return
     fi
     STOP_NUMBER=$(grep '<Phone>' /tmp/received_smses.txt \
                       | sed 's/.*<Phone>\(.*\)<\/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
 }