diff options
| author | Walter Doekes <walter+asterisk@wjd.nu> | 2014-06-09 12:12:25 +0000 |
|---|---|---|
| committer | Walter Doekes <walter+asterisk@wjd.nu> | 2014-06-09 12:12:25 +0000 |
| commit | ce733a02b49d1e6bb08c3eceabd6bed0a14ff1bd (patch) | |
| tree | d5262d7a595dc6919196e9920df1ab8c8c448830 | |
| parent | 8da7f0248f2ade26f14e5ce3986412a39de6f960 (diff) | |
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@415524 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | UPGRADE.txt | 6 | ||||
| -rw-r--r-- | contrib/scripts/safe_asterisk | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt index 8a5cbb94b..65c7f3a75 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -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. diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk index daf261608..8901d8a83 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 "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 |