Changeset 1206 for trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

Timestamp:

06/05/15 17:28:35 (9 years ago)

Author:

sdipsl

Message:

• Remove IGCM_debug_Verif_Exit_Post. Only IGCM_debug_Verif_Exit will manage exit cases.

File:

• trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh (modified) (1 diff)

trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

@@ -704 +704 @@
 function IGCM_debug_Verif_Exit {
   if ( ${ExitFlag} ) ; then
-    # Plan to send an email here with IGCM_sys_SendMail
-    if [ X${TaskType} != Xchecking ] ; then
+    echo "IGCM_debug_Verif_Exit : Something wrong happened previously."
+    # Only computing TaskType stops the job for now.
+    if [ X${TaskType} = Xcomputing ] ; then
       IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration PeriodState "Fatal"
-      echo "IGCM_debug_Verif_Exit : Something wrong happened previously."
       echo "IGCM_debug_Verif_Exit : ERROR and EXIT keyword will help find out where."
       echo "                        EXIT THE JOB."
       echo
       IGCM_debug_CallStack
-    fi
-
-    if [ X${ActivateBigBro} = Xtrue ] ; then
-      # RabbitMQ message code "EXIT THE JOBS BECAUSE ERROR(S) HAS BEEN TRIGGERED"
-      code=9999
-      # RabbitMQ message body
-      Body=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" )
-      # To be sure we flush message buffer and clean up behind us before the end of the simulation
-      FlushAMQP=true
-      # Fill the rabbitMQ queue
-      IGCM_debug_sendAMQP
-    fi
-
-    # Mail notification
-    IGCM_sys_SendMail
-
-    # And Good Bye
-    date
-    exit 1
-  fi
-}
-
-#D-#==================================================
-#D-function IGCM_debug_Verif_Exit_Post
-#D-* Purpose: exit with number 1 if ExitFlag is true for Post-treatment
-#D-
-function IGCM_debug_Verif_Exit_Post {
-  if ( ${ExitFlag} ) ; then
-    echo "IGCM_debug_Verif_Exit_Post : Something wrong happened."
-    # If SpaceName is PROD then we stop if post_processing fails
-    # Plan to send an email here with IGCM_sys_SendMail
-    if [ X${config_UserChoices_SpaceName} = XPROD ] ; then
-      echo "                        EXIT THE JOB."
-      echo
+
+      if [ X${ActivateBigBro} = Xtrue ] ; then
+        # RabbitMQ message code "EXIT THE JOBS BECAUSE ERROR(S) HAS BEEN TRIGGERED"
+        code=9999
+        # RabbitMQ message body
+        Body=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" )
+        # To be sure we flush message buffer and clean up behind us before the end of the simulation
+        FlushAMQP=true
+        # Fill the rabbitMQ queue
+        IGCM_debug_sendAMQP
+      fi
+
       # Mail notification
-      #IGCM_sys_SendMailPost
+      IGCM_sys_SendMail
+
       # And Good Bye
       date
       exit 1
-    else
-      echo "Either inside config.card the variable SpaceName is not in PROD"
-      echo "or inside the main Job the variable JobType is not in RUN mode"
-      echo "              SO WE DO NOT EXIT THE JOB."
-      echo
-      date
+
+    elif [ X${TaskType} = Xpost-processing ] ; then
+      # If SpaceName is PROD then we stop when post_processing failed
+      if [ X${config_UserChoices_SpaceName} = XPROD ] ; then
+        echo "                        EXIT THE JOB."
+        echo
+        # Mail notification?
+        #IGCM_sys_SendMailPost
+        # And Good Bye
+        date
+        exit 1
+      else
+        echo "Either inside config.card the variable SpaceName is not in PROD"
+        echo "or inside the main Job the variable JobType is not in RUN mode"
+        echo "              SO WE DO NOT EXIT THE JOB."
+        echo
+        date
+      fi
+    elif [ X${TaskType} = Xchecking ] ; then
+      echo "Do nothing at the moment"
     fi
   fi