https://git.useribm.hu / user-lxc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7fe914a)
Updated vhost{1, 2}.usr (temperature script).
authorZoltán Felleg <zoltan.felleg@userrendszerhaz.hu>
Mon, 21 Dec 2020 13:43:48 +0000 (14:43 +0100)
committerZoltán Felleg <zoltan.felleg@userrendszerhaz.hu>
Mon, 21 Dec 2020 13:43:48 +0000 (14:43 +0100)
sources/vhost1.usr/root/temperature.sh patch | blob | history
sources/vhost2.usr/root/temperature.sh patch | blob | history

diff --git a/sources/vhost1.usr/root/temperature.sh b/sources/vhost1.usr/root/temperature.sh
index e7438ccd10541cadb55423c738e3f427d0496211..811d839b0d3f6efccb81751027892a070569cb2b 100755 (executable)
--- a/sources/vhost1.usr/root/temperature.sh
+++ b/sources/vhost1.usr/root/temperature.sh
@@ -17,6 +17,18 @@ delete_logs() {
         FIRST_LOG=$(ls /var/log/temperature-????????.log | head -n 1)
         rm -f $FIRST_LOG
     fi
+    LOG_COUNT=$(ls /var/log/temperature-script-????????.log | wc -l)
+    if [ $LOG_COUNT -gt 14 ]
+    then
+        FIRST_LOG=$(ls /var/log/temperature-script-????????.log | head -n 1)
+        rm -f $FIRST_LOG
+    fi
+    LOG_COUNT=$(ls /var/log/temperature-std???-????????.log | wc -l)
+    if [ $LOG_COUNT -gt 14 ]
+    then
+        FIRST_LOG=$(ls /var/log/temperature-std???-????????.log | head -n 1)
+        rm -f $FIRST_LOG
+    fi
 }
 
 delete_mail() {
@@ -24,10 +36,17 @@ delete_mail() {
 }
 
 delete_received_smses() {
-    curl --silent --request GET "http://$MODEM_IP/api/webserver/SesTokInfo" >ses_tok.xml
+    PRG_DATE=$(date +%Y%m%d)
+    STR_DATE=$(date)
 
-    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' <ses_tok.xml)
-    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' <ses_tok.xml)
+
+    curl --output /tmp/ses_tok.xml \
+         --request GET \
+         --silent \
+         "http://$MODEM_IP/api/webserver/SesTokInfo"
+
+    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' </tmp/ses_tok.xml)
+    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' </tmp/ses_tok.xml)
 
     # BoxType:
     #   1: received
@@ -43,27 +62,39 @@ delete_received_smses() {
     do
         INDEX=$(echo $LINE | sed 's|^ *<Index>\([0-9]*\)</Index> *$|\1|')
 
-        curl --silent --request GET "http://$MODEM_IP/api/webserver/SesTokInfo" >ses_tok.xml
+        curl --output /tmp/ses_tok.xml \
+             --request GET \
+             --silent \
+             "http://$MODEM_IP/api/webserver/SesTokInfo"
 
-        SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' <ses_tok.xml)
-        TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' <ses_tok.xml)
+        SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' </tmp/ses_tok.xml)
+        TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' </tmp/ses_tok.xml)
 
+        echo "----------------" >>/var/log/temperature-script-${PRG_DATE}.log
+        echo "${STR_DATE}: delete_received_smses" >>/var/log/temperature-script-${PRG_DATE}.log
         curl --header "Cookie: $SESSION_ID" \
              --header "__RequestVerificationToken: $TOKEN" \
              --request POST \
              --silent \
              --data "<?xml version='1.0' encoding='UTF-8'?><request><Index>$INDEX</Index></request>" \
-             http://$MODEM_IP/api/sms/delete-sms
+             http://$MODEM_IP/api/sms/delete-sms >>/var/log/temperature-script-${PRG_DATE}.log
 
-       touch $SCRIPT_STOP
+        touch $SCRIPT_STOP
     done
 }
 
 delete_sent_smses() {
-    curl --silent --request GET "http://$MODEM_IP/api/webserver/SesTokInfo" >ses_tok.xml
+    PRG_DATE=$(date +%Y%m%d)
+    STR_DATE=$(date)
+
+
+    curl --output /tmp/ses_tok.xml \
+         --request GET \
+         --silent \
+         "http://$MODEM_IP/api/webserver/SesTokInfo"
 
-    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' <ses_tok.xml)
-    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' <ses_tok.xml)
+    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' </tmp/ses_tok.xml)
+    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' </tmp/ses_tok.xml)
 
     # BoxType:
     #   1: received
@@ -79,17 +110,22 @@ delete_sent_smses() {
     do
         INDEX=$(echo $LINE | sed 's|^ *<Index>\([0-9]*\)</Index> *$|\1|')
 
-        curl --silent --request GET "http://$MODEM_IP/api/webserver/SesTokInfo" >ses_tok.xml
+        curl --output /tmp/ses_tok.xml \
+             --request GET \
+             --silent \
+             "http://$MODEM_IP/api/webserver/SesTokInfo"
 
-        SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' <ses_tok.xml)
-        TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' <ses_tok.xml)
+        SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' </tmp/ses_tok.xml)
+        TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' </tmp/ses_tok.xml)
 
+        echo "----------------" >>/var/log/temperature-script-${PRG_DATE}.log
+        echo "${STR_DATE}: delete_sent_smses" >>/var/log/temperature-script-${PRG_DATE}.log
         curl --header "Cookie: $SESSION_ID" \
              --header "__RequestVerificationToken: $TOKEN" \
              --request POST \
              --silent \
              --data "<?xml version='1.0' encoding='UTF-8'?><request><Index>$INDEX</Index></request>" \
-             http://$MODEM_IP/api/sms/delete-sms
+             http://$MODEM_IP/api/sms/delete-sms >>/var/log/temperature-script-${PRG_DATE}.log
     done
 }
 
@@ -106,6 +142,8 @@ log_temperature() {
 send_heartbeat_sms() {
     MESSAGE_TYPE=$1
     TEMPERATURE=$2
+    PRG_DATE=$(date +%Y%m%d)
+    STR_DATE=$(date)
 
 
     MESSAGE="Heartbeat ${MESSAGE_TYPE}: temperature is $TEMPERATURE"
@@ -117,22 +155,29 @@ send_heartbeat_sms() {
         i=$(( $i + 1 ))
     done
 
-    curl --silent --request GET "http://$MODEM_IP/api/webserver/SesTokInfo" >ses_tok.xml
+    curl --output /tmp/ses_tok.xml \
+         --request GET \
+         --silent \
+         "http://$MODEM_IP/api/webserver/SesTokInfo"
 
-    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' <ses_tok.xml)
-    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' <ses_tok.xml)
+    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' </tmp/ses_tok.xml)
+    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' </tmp/ses_tok.xml)
 
+    echo "----------------" >>/var/log/temperature-script-${PRG_DATE}.log
+    echo "${STR_DATE}: send_heartbeat_sms" >>/var/log/temperature-script-${PRG_DATE}.log
     curl --header "Cookie: $SESSION_ID" \
          --header "__RequestVerificationToken: $TOKEN" \
-        --request POST \
-        --silent \
+         --request POST \
+         --silent \
          --data "<?xml version='1.0' encoding='UTF-8'?><request><Index>-1</Index><Phones>${SMS_TARGETS}</Phones><Sca></Sca><Content>${MESSAGE}</Content><Length>-1</Length><Reserved>1</Reserved><Date>-1</Date></request>" \
-         http://$MODEM_IP/api/sms/send-sms
+         http://$MODEM_IP/api/sms/send-sms >>/var/log/temperature-script-${PRG_DATE}.log
 }
 
 send_sms() {
     MESSAGE_TYPE=$1
     TEMPERATURE=$2
+    PRG_DATE=$(date +%Y%m%d)
+    STR_DATE=$(date)
 
 
     MESSAGE="${MESSAGE_TYPE}: temperature is $TEMPERATURE"
@@ -144,17 +189,22 @@ send_sms() {
         i=$(( $i + 1 ))
     done
 
-    curl --silent --request GET "http://$MODEM_IP/api/webserver/SesTokInfo" >ses_tok.xml
+    curl --output /tmp/ses_tok.xml \
+         --request GET \
+         --silent \
+         "http://$MODEM_IP/api/webserver/SesTokInfo"
 
-    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' <ses_tok.xml)
-    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' <ses_tok.xml)
+    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' </tmp/ses_tok.xml)
+    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' </tmp/ses_tok.xml)
 
+    echo "----------------" >>/var/log/temperature-script-${PRG_DATE}.log
+    echo "${STR_DATE}: send_sms" >>/var/log/temperature-script-${PRG_DATE}.log
     curl --header "Cookie: $SESSION_ID" \
          --header "__RequestVerificationToken: $TOKEN" \
-        --request POST \
-        --silent \
+         --request POST \
+         --silent \
          --data "<?xml version='1.0' encoding='UTF-8'?><request><Index>-1</Index><Phones>${SMS_TARGETS}</Phones><Sca></Sca><Content>${MESSAGE}</Content><Length>-1</Length><Reserved>1</Reserved><Date>-1</Date></request>" \
-         http://$MODEM_IP/api/sms/send-sms
+         http://$MODEM_IP/api/sms/send-sms >>/var/log/temperature-script-${PRG_DATE}.log
 }
 
 shutdown_hosts() {
diff --git a/sources/vhost2.usr/root/temperature.sh b/sources/vhost2.usr/root/temperature.sh
index e7438ccd10541cadb55423c738e3f427d0496211..811d839b0d3f6efccb81751027892a070569cb2b 100755 (executable)
--- a/sources/vhost2.usr/root/temperature.sh
+++ b/sources/vhost2.usr/root/temperature.sh
@@ -17,6 +17,18 @@ delete_logs() {
         FIRST_LOG=$(ls /var/log/temperature-????????.log | head -n 1)
         rm -f $FIRST_LOG
     fi
+    LOG_COUNT=$(ls /var/log/temperature-script-????????.log | wc -l)
+    if [ $LOG_COUNT -gt 14 ]
+    then
+        FIRST_LOG=$(ls /var/log/temperature-script-????????.log | head -n 1)
+        rm -f $FIRST_LOG
+    fi
+    LOG_COUNT=$(ls /var/log/temperature-std???-????????.log | wc -l)
+    if [ $LOG_COUNT -gt 14 ]
+    then
+        FIRST_LOG=$(ls /var/log/temperature-std???-????????.log | head -n 1)
+        rm -f $FIRST_LOG
+    fi
 }
 
 delete_mail() {
@@ -24,10 +36,17 @@ delete_mail() {
 }
 
 delete_received_smses() {
-    curl --silent --request GET "http://$MODEM_IP/api/webserver/SesTokInfo" >ses_tok.xml
+    PRG_DATE=$(date +%Y%m%d)
+    STR_DATE=$(date)
 
-    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' <ses_tok.xml)
-    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' <ses_tok.xml)
+
+    curl --output /tmp/ses_tok.xml \
+         --request GET \
+         --silent \
+         "http://$MODEM_IP/api/webserver/SesTokInfo"
+
+    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' </tmp/ses_tok.xml)
+    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' </tmp/ses_tok.xml)
 
     # BoxType:
     #   1: received
@@ -43,27 +62,39 @@ delete_received_smses() {
     do
         INDEX=$(echo $LINE | sed 's|^ *<Index>\([0-9]*\)</Index> *$|\1|')
 
-        curl --silent --request GET "http://$MODEM_IP/api/webserver/SesTokInfo" >ses_tok.xml
+        curl --output /tmp/ses_tok.xml \
+             --request GET \
+             --silent \
+             "http://$MODEM_IP/api/webserver/SesTokInfo"
 
-        SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' <ses_tok.xml)
-        TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' <ses_tok.xml)
+        SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' </tmp/ses_tok.xml)
+        TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' </tmp/ses_tok.xml)
 
+        echo "----------------" >>/var/log/temperature-script-${PRG_DATE}.log
+        echo "${STR_DATE}: delete_received_smses" >>/var/log/temperature-script-${PRG_DATE}.log
         curl --header "Cookie: $SESSION_ID" \
              --header "__RequestVerificationToken: $TOKEN" \
              --request POST \
              --silent \
              --data "<?xml version='1.0' encoding='UTF-8'?><request><Index>$INDEX</Index></request>" \
-             http://$MODEM_IP/api/sms/delete-sms
+             http://$MODEM_IP/api/sms/delete-sms >>/var/log/temperature-script-${PRG_DATE}.log
 
-       touch $SCRIPT_STOP
+        touch $SCRIPT_STOP
     done
 }
 
 delete_sent_smses() {
-    curl --silent --request GET "http://$MODEM_IP/api/webserver/SesTokInfo" >ses_tok.xml
+    PRG_DATE=$(date +%Y%m%d)
+    STR_DATE=$(date)
+
+
+    curl --output /tmp/ses_tok.xml \
+         --request GET \
+         --silent \
+         "http://$MODEM_IP/api/webserver/SesTokInfo"
 
-    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' <ses_tok.xml)
-    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' <ses_tok.xml)
+    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' </tmp/ses_tok.xml)
+    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' </tmp/ses_tok.xml)
 
     # BoxType:
     #   1: received
@@ -79,17 +110,22 @@ delete_sent_smses() {
     do
         INDEX=$(echo $LINE | sed 's|^ *<Index>\([0-9]*\)</Index> *$|\1|')
 
-        curl --silent --request GET "http://$MODEM_IP/api/webserver/SesTokInfo" >ses_tok.xml
+        curl --output /tmp/ses_tok.xml \
+             --request GET \
+             --silent \
+             "http://$MODEM_IP/api/webserver/SesTokInfo"
 
-        SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' <ses_tok.xml)
-        TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' <ses_tok.xml)
+        SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' </tmp/ses_tok.xml)
+        TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' </tmp/ses_tok.xml)
 
+        echo "----------------" >>/var/log/temperature-script-${PRG_DATE}.log
+        echo "${STR_DATE}: delete_sent_smses" >>/var/log/temperature-script-${PRG_DATE}.log
         curl --header "Cookie: $SESSION_ID" \
              --header "__RequestVerificationToken: $TOKEN" \
              --request POST \
              --silent \
              --data "<?xml version='1.0' encoding='UTF-8'?><request><Index>$INDEX</Index></request>" \
-             http://$MODEM_IP/api/sms/delete-sms
+             http://$MODEM_IP/api/sms/delete-sms >>/var/log/temperature-script-${PRG_DATE}.log
     done
 }
 
@@ -106,6 +142,8 @@ log_temperature() {
 send_heartbeat_sms() {
     MESSAGE_TYPE=$1
     TEMPERATURE=$2
+    PRG_DATE=$(date +%Y%m%d)
+    STR_DATE=$(date)
 
 
     MESSAGE="Heartbeat ${MESSAGE_TYPE}: temperature is $TEMPERATURE"
@@ -117,22 +155,29 @@ send_heartbeat_sms() {
         i=$(( $i + 1 ))
     done
 
-    curl --silent --request GET "http://$MODEM_IP/api/webserver/SesTokInfo" >ses_tok.xml
+    curl --output /tmp/ses_tok.xml \
+         --request GET \
+         --silent \
+         "http://$MODEM_IP/api/webserver/SesTokInfo"
 
-    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' <ses_tok.xml)
-    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' <ses_tok.xml)
+    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' </tmp/ses_tok.xml)
+    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' </tmp/ses_tok.xml)
 
+    echo "----------------" >>/var/log/temperature-script-${PRG_DATE}.log
+    echo "${STR_DATE}: send_heartbeat_sms" >>/var/log/temperature-script-${PRG_DATE}.log
     curl --header "Cookie: $SESSION_ID" \
          --header "__RequestVerificationToken: $TOKEN" \
-        --request POST \
-        --silent \
+         --request POST \
+         --silent \
          --data "<?xml version='1.0' encoding='UTF-8'?><request><Index>-1</Index><Phones>${SMS_TARGETS}</Phones><Sca></Sca><Content>${MESSAGE}</Content><Length>-1</Length><Reserved>1</Reserved><Date>-1</Date></request>" \
-         http://$MODEM_IP/api/sms/send-sms
+         http://$MODEM_IP/api/sms/send-sms >>/var/log/temperature-script-${PRG_DATE}.log
 }
 
 send_sms() {
     MESSAGE_TYPE=$1
     TEMPERATURE=$2
+    PRG_DATE=$(date +%Y%m%d)
+    STR_DATE=$(date)
 
 
     MESSAGE="${MESSAGE_TYPE}: temperature is $TEMPERATURE"
@@ -144,17 +189,22 @@ send_sms() {
         i=$(( $i + 1 ))
     done
 
-    curl --silent --request GET "http://$MODEM_IP/api/webserver/SesTokInfo" >ses_tok.xml
+    curl --output /tmp/ses_tok.xml \
+         --request GET \
+         --silent \
+         "http://$MODEM_IP/api/webserver/SesTokInfo"
 
-    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' <ses_tok.xml)
-    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' <ses_tok.xml)
+    SESSION_ID=$(sed 's|^.*<SesInfo>\(.*\)</SesInfo>.*$|\1|' </tmp/ses_tok.xml)
+    TOKEN=$(sed 's|^.*<TokInfo>\(.*\)</TokInfo>.*$|\1|' </tmp/ses_tok.xml)
 
+    echo "----------------" >>/var/log/temperature-script-${PRG_DATE}.log
+    echo "${STR_DATE}: send_sms" >>/var/log/temperature-script-${PRG_DATE}.log
     curl --header "Cookie: $SESSION_ID" \
          --header "__RequestVerificationToken: $TOKEN" \
-        --request POST \
-        --silent \
+         --request POST \
+         --silent \
          --data "<?xml version='1.0' encoding='UTF-8'?><request><Index>-1</Index><Phones>${SMS_TARGETS}</Phones><Sca></Sca><Content>${MESSAGE}</Content><Length>-1</Length><Reserved>1</Reserved><Date>-1</Date></request>" \
-         http://$MODEM_IP/api/sms/send-sms
+         http://$MODEM_IP/api/sms/send-sms >>/var/log/temperature-script-${PRG_DATE}.log
 }
 
 shutdown_hosts() {
user-lxc repository