bzr commit into mysql-falcon branch (hky:372)

[Hakan Kuecuekyilmaz]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/mysql-falcon/ based on revid:hky@stripped

  372 Hakan Kuecuekyilmaz	2009-04-01
      If we do not have nail as mailer, we have to use uuencode to attach files to our mails.

    modified:
      mysqlslap/runner.sh
=== modified file 'mysqlslap/runner.sh'
--- a/mysqlslap/runner.sh	2009-03-31 23:50:38 +0000
+++ b/mysqlslap/runner.sh	2009-04-01 00:41:58 +0000
@@ -32,6 +32,16 @@ fi
 source ${HOST_INCLUDE_FILE}
 
 #
+# Mail program to use. mail|mailx does not support -a (attachments),
+# whereas nail does.
+#
+HAVE_NAIL=0
+MAIL_TEST=$(which nail 2> /dev/null)
+if [ $? = 0 ]; then
+    HAVE_NAIL=1
+fi
+
+#
 # Directories.
 #
 #FALCON='mysql-6.0'
@@ -213,13 +223,21 @@ if [ $? != 0 ]; then
     echo $MSG >> $LOG
     echo $MSG | $MAIL -s $MSG $ADMIN
 else
-    echo "Run of mysqlslap succeeded" | $MAIL -a /tmp/falcon_blackhole_innodb.csv -s"Run of mysqlslap succeeded on $HOSTNAME" $ADMIN
+    if [ $HAVE_NAIL = 1 ]; then
+        echo "Run of mysqlslap succeeded" | $MAIL -a /tmp/falcon_blackhole_innodb.csv -s"Run of mysqlslap succeeded on $HOSTNAME" $ADMIN
+    else
+        (echo "Run of mysqlslap succeeded"; uuencode /tmp/falcon_blackhole_innodb.csv /tmp/falcon_blackhole_innodb.csv) | $MAIL -s"Run of mysqlslap succeeded on $HOSTNAME" $ADMIN
+    fi
 fi
 
 CRASH=$(grep "$STACKTRACE" ${DATA_DIR}/${HOSTNAME}.err)
 if [ x"$CRASH" != x"" ]; then
     # There was a crash! Mail out info.
-    echo "There was a crash on $HOSTNAME" | $MAIL -a ${DATA_DIR}/${HOSTNAME}.err -s "[ERROR]: mysqlslap failure on $HOSTNAME" $ADMIN
+    if [ $HAVE_NAIL = 1 ]; then
+        echo "There was a crash on $HOSTNAME" | $MAIL -a ${DATA_DIR}/${HOSTNAME}.err -s "[ERROR]: mysqlslap failure on $HOSTNAME" $ADMIN
+    else
+        (echo "There was a crash on $HOSTNAME"; uuencode ${DATA_DIR}/${HOSTNAME}.err ${DATA_DIR}/${HOSTNAME}.err) | $MAIL -s "[ERROR]: mysqlslap failure on $HOSTNAME" $ADMIN
+    fi
 fi
 
 killall_mysqlslap


Attachment: [text/bzr-bundle] bzr/[e-mail]