diff --git a/src-sh/lpreserver/backend/functions.sh b/src-sh/lpreserver/backend/functions.sh index 42dc32ad6..e541344dc 100755 --- a/src-sh/lpreserver/backend/functions.sh +++ b/src-sh/lpreserver/backend/functions.sh @@ -141,7 +141,7 @@ echo_log() { # 2 = Message email_msg() { if [ -z "$EMAILADDY" ] ; then return ; fi - echo -e "$2" | mail -s "Life-Preserver `hostname`: $1" $EMAILADDY + echo -e "$2" | mail -s "$1 - `hostname`" $EMAILADDY } queue_msg() { diff --git a/src-sh/lpreserver/backend/runrep.sh b/src-sh/lpreserver/backend/runrep.sh index 6eb65b395..d54f427ef 100755 --- a/src-sh/lpreserver/backend/runrep.sh +++ b/src-sh/lpreserver/backend/runrep.sh @@ -29,9 +29,9 @@ else fi case $EMAILMODE in - ALL) email_msg "Automated Replication - $title" "`echo_queue_msg`" ;; + ALL) email_msg "$title - Automated Replication" "`echo_queue_msg`" ;; *) if [ $status -ne 0 ] ; then - email_msg "Automated Replication - $title" "`echo_queue_msg`" + email_msg "$title - Automated Replication" "`echo_queue_msg`" fi ;; esac diff --git a/src-sh/lpreserver/backend/runsnap.sh b/src-sh/lpreserver/backend/runsnap.sh index 9aa8b2ded..0a0c36bca 100755 --- a/src-sh/lpreserver/backend/runsnap.sh +++ b/src-sh/lpreserver/backend/runsnap.sh @@ -64,12 +64,12 @@ done # If we failed at any point, sent out a notice if [ $snapStat -ne 0 ] ; then - email_msg "Automated Snapshot - FAILED" "`echo_queue_msg`" + email_msg "FAILED - Automated Snapshot" "`echo_queue_msg`" fi # If we are successful and user wants all notifications, send out a message if [ $snapStat -eq 0 -a "$EMAILMODE" = "ALL" ] ; then - email_msg "Automated Snapshot - Success" "`echo_queue_msg`" + email_msg "Success - Automated Snapshot" "`echo_queue_msg`" fi # Check if we need to run a replication task for this dataset