kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

safe_asterisk: Cleanup additions to r415132.

Browse Source 
* 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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@415524 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Walter Doekes
2014-06-09 12:12:25 +00:00
parent 8da7f0248f
commit ce733a02b4
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
UPGRADE.txt
View File

@@ -23,6 +23,12 @@
From 12 to 13: 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 - The asterisk command line -I option and the asterisk.conf internal_timing
option are removed and always enabled if any timing module is loaded. option are removed and always enabled if any timing module is loaded.

5
contrib/scripts/safe_asterisk
View File

@@ -173,11 +173,10 @@ run_asterisk()
exit 0 exit 0
elif test $EXITSTATUS -gt 128; then elif test $EXITSTATUS -gt 128; then
EXITSIGNAL=$((EXITSTATUS - 128)) EXITSIGNAL=$((EXITSTATUS - 128))
echo "Asterisk exited on signal $EXITSIGNAL." message "Asterisk exited on signal $EXITSIGNAL."
if test -n "$NOTIFY"; then if test -n "$NOTIFY"; then
echo "Asterisk on $MACHINE exited on signal $EXITSIGNAL. Might want to take a peek." | \ echo "Asterisk on $MACHINE exited on signal $EXITSIGNAL. Might want to take a peek." | \
mail -s "Asterisk Died" $NOTIFY mail -s "Asterisk on $MACHINE died (sig $EXITSIGNAL)" $NOTIFY
message "Exited on signal $EXITSIGNAL"
fi fi
if test -n "$EXEC"; then if test -n "$EXEC"; then
$EXEC $EXEC