Changeset 987

Timestamp:

02/18/14 14:55:16 (10 years ago)

Author:

sdipsl

Message:

bugfix with messages_count + cosmetics

File:

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

trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

@@ -147 +147 @@
 function IGCM_debug_send_AMQP_msg__MAILTUNNEL {
 
-  typeset b64_encoded_msg buffer mail_recipient send_messages mail_frequency last_mail_date__file
+  typeset b64_encoded_msg mail_recipient
+  typeset buffer send_messages mail_frequency 
+  typeset last_mail_date__file
+
   b64_encoded_msg=$1
 
@@ -162 +165 @@
   fi
 
-  messages_count=$( wc -l ${buffer} ) # retrieve how many pending messages
+  # retrieve pending messages number
+  messages_count=$( wc -l ${buffer} | gawk {'print $1'} )
 
   if [ ! -f "${last_mail_date__file}" ]; then
-    # if we are here, it means no mail sent yet
+    # if we are here, it means no mail has been sent yet
     if [ ${messages_count} -gt 0 ]; then
       # send the first mail
@@ -181 +185 @@
   # send mail / add message in buffer
   if [ ${send_messages} -eq 1 ]; then
-    cat ${buffer} | mail -s mail_recipient  # send buffer
-    > $buffer                               # clear buffer
-    touch ${last_mail_date__file}           # memorize last mail date
+    mail -s "AMQP" ${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
+
   # Allways all good for now.
   return 0