Changeset 18851

Timestamp:

05/14/17 02:29:35 (8 years ago)

Author:

Daniela Dorner

Message:

adapted as discussed in telcon (implemented warning if files in fails-folder)

File:

• trunk/DataCheck/Transfer/CheckTransfer.sh (modified) (3 diffs)

trunk/DataCheck/Transfer/CheckTransfer.sh

@@ -934 +934 @@
       if [ "$result1" = "0-0000" ] && [ "$result3" = "0010" ] && [ "$result4" = "0000" ] && [ ${archive[0]} -eq $numisdc ]
       then 
-         echo "  "${fails[0]}" file(s) corrupt (fails folder), but files are transfered correctly. "
-         echo "  "${fails[0]}" file(s) corrupt (fails folder), but files are transfered correctly. " >> $logfile 2>&1
-         echo "  "${fails[0]}" file(s) corrupt (fails folder), but files are transfered correctly. " >> $logfile2 2>&1
-         echo "  TRANSFER is ok. "$date" can be deleted. "
+         echo "  "${fails[0]}" file(s) corrupt (fails folder) - please check if files are transfered correctly! "
+         echo "  "${fails[0]}" file(s) corrupt (fails folder) - please check if files are transfered correctly! " >> $logfile 2>&1
+         echo "  "${fails[0]}" file(s) corrupt (fails folder) - please check if files are transfered correctly! " >> $logfile2 2>&1
+         echo "  TRANSFER to be checked. "$date" can be deleted only if files in fails folder are fine. "
          echo "" >> $logfile 2>&1
-         echo "  TRANSFER is ok. "$date" can be deleted. " >> $logfile 2>&1
-         echo "  TRANSFER is ok. "$date" can be deleted. " >> $logfile2 2>&1
+         echo "  TRANSFER to be checked. "$date" can be deleted only if files in fails folder are fine. " >> $logfile 2>&1
+         echo "  TRANSFER to be checked.. "$date" can be deleted only if files in fails folder are fine. " >> $logfile2 2>&1
          echo "    Details in the logfile "$logfile
          echo "" >> $logfile 2>&1
@@ -987 +987 @@
    if [ ${fails[0]} -gt 0 ] || [ $numisdc -ne $numisdc2 ]
    then
-      echo "  INFO there is "${fails[0]}" file in the fails folder. Please check. "
-      echo "  INFO there is "${fails[0]}" file in the fails folder. Please check. " >> $logfile 2>&1
-      echo "  INFO there is "${fails[0]}" file in the fails folder. Please check. " >> $logfile2 2>&1
+      numdiff=`echo " $numisdc2 - $numisdc " | bc`
+      echo "  WARN there is files marked as failed (fails folder: "${fails[0]}", DB: "$numdiff"). Please check. "
+      echo "  WARN there is files marked as failed (fails folder: "${fails[0]}", DB: "$numdiff"). Please check. " >> $logfile 2>&1
+      echo "  WARN there is files marked as failed (fails folder: "${fails[0]}", DB: "$numdiff"). Please check. " >> $logfile2 2>&1
    fi
    echo ""
@@ -999 +1000 @@
 if [ "$sendemail" = "yes" ]
 then
+   echo "" >> $logfile2 2>&1
+   echo " REMARK: If you took some action to fix a problem and want that a day in checked again, " >> $logfile2 2>&1
+   echo "         please move the logfile to "`dirname $logfile`"CheckTransfer_YYYY-MM-DD.log.cp " >> $logfile2 2>&1
+   echo "         (or *.cp2 if the first does already exist ...) " >> $logfile2 2>&1
+   echo "         Then restart "$0 >> $logfile2 2>&1
+   echo "" >> $logfile2 2>&1
+
    echo ""
    echo "INFO send email with "$logfile2" to shift@fact-project.org "
    printprocesslog "INFO send email with "$logfile2" to shift@fact-project.org "
-   cat $logfile2 | mail -s "testmail for info on deleting data" shift@fact-project.org
+   cat $logfile2 | mail -s "Info for Deleting Data" shift@fact-project.org
 fi