From: Walter Doekes <walter+asterisk@wjd.nu>
Date: Mon, 9 Jun 2014 11:57:09 +0000 (+0000)
Subject: safe_asterisk: Cleanup additions to r415132.
X-Git-Tag: 11.11.0-rc1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea8009da8e86d020eb611e0babc3459ad1df373b;p=thirdparty%2Fasterisk.git

safe_asterisk: Cleanup additions to r415132.

Replaced a stray echo that should've been a message call in
safe_asterisk. I'm using the contents of the old message inside the
if $NOTIFY so peoples log parsing scripts won't get confused by new
messages. I'll clean that up in trunk.

(Note that a 'make install' still won't overwrite your old safe_asterisk
if it exists. See ASTERISK-21965.)

ASTERISK-23492 #close
........

Merged revisions 415521 from http://svn.asterisk.org/svn/asterisk/branches/1.8


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@415522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk
index daf261608c..80aa0ca2ef 100644
--- a/contrib/scripts/safe_asterisk
+++ b/contrib/scripts/safe_asterisk
@@ -173,11 +173,10 @@ run_asterisk()
 			exit 0
 		elif test $EXITSTATUS -gt 128; then
 			EXITSIGNAL=$((EXITSTATUS - 128))
-			echo "Asterisk exited on signal $EXITSIGNAL."
+			message "Exited on signal $EXITSIGNAL"
 			if test -n "$NOTIFY"; then
 				echo "Asterisk on $MACHINE exited on signal $EXITSIGNAL.  Might want to take a peek." | \
 				mail -s "Asterisk Died" $NOTIFY
-				message "Exited on signal $EXITSIGNAL"
 			fi
 			if test -n "$EXEC"; then
 				$EXEC