[asterisk-commits] wdoekes: trunk r415524 - in /trunk: ./ UPGRADE.txt contrib/scripts/safe_asterisk

[SVN commits to the Asterisk project]

Author: wdoekes
Date: Mon Jun  9 07:12:25 2014
New Revision: 415524

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=415524
Log:
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
........

Merged revisions 415523 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/UPGRADE.txt
    trunk/contrib/scripts/safe_asterisk

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE.txt?view=diff&rev=415524&r1=415523&r2=415524
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Mon Jun  9 07:12:25 2014
@@ -23,6 +23,12 @@
 
 From 12 to 13:
 
+ - 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)"
+
  - The asterisk command line -I option and the asterisk.conf internal_timing
    option are removed and always enabled if any timing module is loaded.
 

Modified: trunk/contrib/scripts/safe_asterisk
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/scripts/safe_asterisk?view=diff&rev=415524&r1=415523&r2=415524
==============================================================================
--- trunk/contrib/scripts/safe_asterisk (original)
+++ trunk/contrib/scripts/safe_asterisk Mon Jun  9 07:12:25 2014
@@ -173,11 +173,10 @@
 			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