safe_asterisk: Cleanup additions to r415132.

* Replaced a stray echo that should've been a message call in
  safe_asterisk. This replaces a conditional log message by a slightly
  different message. Please update your log parsing scripts.
* Made the $NOTIFY mail Subject more verbose by adding the machine name
  and exitstatus.

(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
........

Merged revisions 415522 from http://svn.asterisk.org/svn/asterisk/branches/11

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

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 613f4b377faa621b7988c6574b7844b03da99f57..d3e2f4fbf9f4bc4ffd8b77ee55cd5bd42c21641b 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -20,6 +20,15 @@
 === UPGRADE-11.txt  -- Upgrade info for 10 to 11
 ===
 ===========================================================
+
+From 12.3.0 to 12.4.0:
+
+ - Changed a log message in safe_asterisk and the $NOTIFY mail subject. If
+   you use tools to parse either of them, update your parse functions
+   accordingly. The changed strings are:
+   - "Exited on signal $EXITSIGNAL" => "Asterisk exited on signal $EXITSIGNAL."
+   - "Asterisk Died" => "Asterisk on $MACHINE died (sig $EXITSIGNAL)"
+
 From 12.2.0 to 12.3.0:
 
  - The asterisk command line -I option and the asterisk.conf internal_timing

diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk
index daf261608c23e21ecac1646708f3e09f314c4995..8901d8a83557f99e536bba9c26074adf09099e28 100644 (file)
--- 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 "Asterisk 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"
+                               mail -s "Asterisk on $MACHINE died (sig $EXITSIGNAL)" $NOTIFY
                        fi
                        if test -n "$EXEC"; then
                                $EXEC