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

Timestamp:

03/04/14 15:42:09 (10 years ago)

Author:

sdipsl

Message:

don't forget the last message

File:

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

trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

@@ -170 +170 @@
   if [ ! -f "${last_mail_date__file}" ]; then
     # if we are here, it means no mail has been sent yet
-    if [ ${messages_count} -gt 0 ]; then
-      # send the first mail
-      send_messages=1
-    fi
+    # send the first mail
+    [ ${messages_count} -gt 0 ] && send_messages=1
   else
      # compute last time the file was changed (in seconds)
     seconds_since_last_mail=$(( $(date +%s) - $(stat -c %Y ${last_mail_date__file}) ))
-
-    if [ ${seconds_since_last_mail} -gt ${mail_frequency} ]; then
-      send_messages=1
-    fi
-  fi
-
-  # send mail / add message in buffer
-  if [ ${send_messages} -eq 1 ]; then
+    # send message when exceeding threshold
+    [ ${seconds_since_last_mail} -gt ${mail_frequency} ] && send_messages=1
+  fi
+
+  # queue messages in the buffer
+  echo ${b64_encoded_msg} >> ${buffer}
+
+  # send mail
+  if ( [ ${send_messages} -eq 1 ] || [ X${FlushAMQP} = XTRUE ] ) ; then
     mail -s "[TEMPORARY AMQP CHANNEL]" ${mail_recipient}  < ${buffer} # send buffer
     rm -f $buffer ; touch ${buffer}                                   # clear buffer
     touch ${last_mail_date__file}                                     # memorize last mail date
-  else
-    echo ${b64_encoded_msg} >> ${buffer}
   fi