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

Timestamp:

10/15/14 14:35:29 (10 years ago)

Author:

sdipsl

Message:

Minor bugfix to avoid sending config.card each time a simulation resubmit itself

File:

• trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh (modified) (4 diffs)

trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

@@ -188 +188 @@
 
   if [ X${initBigBro} = Xtrue ] ; then
+    #echo $(date +"%Y-%m-%dT%H:%M:%S.%N%z") > ${SUBMIT_DIR}/mail.txt
     mailx -s "[TEMPORARY AMQP CHANNEL]" -a ${SUBMIT_DIR}/config.card.base64 ${mail_recipient} < ${buffer} # send buffer
     rm -f $buffer ; touch ${buffer}                                    # clear buffer
@@ -193 +194 @@
     initBigBro=false
   elif ( [ ${send_messages} -eq 1 ] || [ X${FlushAMQP} = XTRUE ] ) ; then
+    #echo $(date +"%Y-%m-%dT%H:%M:%S.%N%z") >> ${SUBMIT_DIR}/mail.txt
     mailx -s "[TEMPORARY AMQP CHANNEL]" ${mail_recipient}  < ${buffer} # send buffer
     rm -f $buffer ; touch ${buffer}                                    # clear buffer
@@ -247 +249 @@
   fi
 
-  status=$?
   if [ ${status} -gt 0 ] ; then
     IGCM_debug_Print 2 "IGCM_debug_Push/PopStack/ActivateBigBro : command sendAMQPMsg failed error code ${status}"
@@ -572 +573 @@
       simuid=$(uuidgen)
       IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration simuid ${simuid}
-
       # Standard fields for the first message
       genericSimulationID=$( echo "\"msgApplication\":\"monitoring\",\"msgProducer\":\"libigcm\",\"activity\":\"IPSL\",\"name\":\"${config_UserChoices_JobName}\",\"cumulPeriod\":\"${CumulPeriod}\",\"experiment\":\"${config_UserChoices_ExperimentName}\",\"space\":\"${config_UserChoices_SpaceName}\",\"model\":\"${config_UserChoices_TagName}\",\"startDate\":\"${config_UserChoices_DateBegin}\",\"endDate\":\"${config_UserChoices_DateEnd}\",\"login\":\"${LOGIN}\",\"centre\":\"${CENTER}\",\"machine\":\"${MASTER}\",\"simuid\":\"${simuid}\",\"jobuid\":\"${jobuid}\"" )
+      # RabbitMQ message body with specific fields associated message codes treated here
+      Body=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" )
+      # Fill the rabbitMQ queue (the config.card in use will be sent)
+      IGCM_debug_sendAMQP activate
     else
       # RabbitMQ message code "A NEW JOB IS RUNNING PART OF A SIMULATION"
       code=1000
-      #
       # retrieve this simulation's unique id
       IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration simuid
       simuid=${run_Configuration_simuid}
-
       # Using standard fields for message others than the first one. Still subject to change
       genericSimulationID=$( echo "\"msgApplication\":\"monitoring\",\"msgProducer\":\"libigcm\",\"cumulPeriod\":\"${CumulPeriod}\",\"simuid\":\"${simuid}\",\"jobuid\":\"${jobuid}\"" )
-    fi
-
-    # RabbitMQ message body with specific fields associated message codes treated here
-    Body=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" )
-
-    # Fill the rabbitMQ queue (the config.card in use will be sent)
-    IGCM_debug_sendAMQP activate
+      # RabbitMQ message body with specific fields associated message codes treated here
+      Body=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" )
+      # Fill the rabbitMQ queue
+      IGCM_debug_sendAMQP
+    fi
 
     # NOT VERY NICE BUT ... IT WORKS