Changeset 19519 for trunk/DataCheck

Timestamp:

05/28/19 11:36:23 (5 years ago)

Author:

Daniela Dorner

Message:

bugfixes

File:

• trunk/DataCheck/Monitoring/CheckSwiftSchedule.sh (modified) (3 diffs)

trunk/DataCheck/Monitoring/CheckSwiftSchedule.sh

@@ -39 +39 @@
 function getschedule()
 {
-   text=`links -width 300 -ssl.certificates 0 -dump https://www.swift.psu.edu/operations/obsSchedule.php?d=$1 | grep $1'\|was not found' >> $schedulefile `
+   text=$( { links -width 300 -ssl.certificates 0 -dump https://www.swift.psu.edu/operations/obsSchedule.php?d=$1 | grep $1'\|was not found\|Connection' >> $schedulefile ; } 2>&1 )
    #text=`links -width 300 -ssl.certificates 0 -dump https://www.swift.psu.edu/operations/obsSchedule.php?d=$1 | grep $1 >> $schedulefile `
    check1=$?
-   #echo "check "$check1
    if [ "$text" != "" ] || [ $check1 -gt 0 ]
    then
@@ -48 +47 @@
       printprocesslog "WARN could not get Swift schedule ("$text", return code: "$check1")"
       echo "WARN could not get Swift schedule ("$text", return code: "$check1")"
-      if [ "$text" = "Connection timed out" ]
+      if [ "$text" = "Connection timed out" ] || [ "$text" = "Connection refused" ]
       then
          printprocesslog "WARN could not connect to https://www.swift.psu.edu/operations/obsSchedule.php?d="$1
@@ -125 +124 @@
    #   1: differences found
    #  >1: error
+   upd=""
    if [ -e $schedulefile2old ]
    then
-      if diff $schedulefile2 $schedulefile2old >/dev/null 
+      diff $schedulefile2 $schedulefile2old >/dev/null
+      checkdiff=$?
+      if [ $checkdiff -eq 0 ]
       then
          printprocesslog "INFO Schedule did not change."