Merged revisions 115285 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115285 | tilghman | 2008-05-04 22:22:25 -0500 (Sun, 04 May 2008) | 7 lines

When starting Asterisk, bug out if Asterisk is already running.
(closes issue #12525)
 Reported by: explidous
 Patches: 
       20080428__bug12525.diff.txt uploaded by Corydon76 (license 14)
 Tested by: mvanbaak

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115286 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.1
Tilghman Lesher 17 years ago
parent b8dae12c06
commit e01ada1ca7

@ -51,6 +51,14 @@ fi
case "$1" in
start)
# Check if Asterisk is already running. If it is, then bug out, because
# starting up Asterisk when Asterisk is already running is very bad.
VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version'`
if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
echo "Asterisk is already running. $0 will exit now."
exit 1
fi
log_begin_msg "Starting $DESC: $NAME"
if [ $AST_USER ] ; then
ASTARGS="-U $AST_USER"

@ -6,6 +6,14 @@ depend() {
}
start() {
# Check if Asterisk is already running. If it is, then bug out, because
# starting safe_asterisk when Asterisk is running is very bad.
VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version'`
if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
echo "Asterisk is already running. $0 will exit now."
exit 1
fi
ebegin "Starting Asterisk"
/usr/sbin/asterisk
eend $? "Failed to start Asterisk"

@ -119,6 +119,14 @@ run_asterisk()
case "$1" in
start)
# Check if Asterisk is already running. If it is, then bug out, because
# starting Asterisk when Asterisk is already running is very bad.
VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version'`
if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
echo "Asterisk is already running. $0 will exit now."
exit 1
fi
gprintf "Starting asterisk: "
run_asterisk >/dev/null 2>&1 &
sleep 2 # Give it time to die

@ -68,6 +68,14 @@ fi
RETVAL=0
start() {
# Check if Asterisk is already running. If it is, then bug out, because
# starting safe_asterisk when Asterisk is running is very bad.
VERSION=`${AST_SBIN}/asterisk -rx 'core show version'`
if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
echo "Asterisk is already running."
exit 1
fi
# Start daemons.
echo -n $"Starting asterisk: "
if [ -f $SAFE_ASTERISK ] ; then

@ -10,6 +10,14 @@
asterisk_start() {
if [ -x /usr/sbin/asterisk ]; then
# Check if Asterisk is already running. If it is, then bug out, because
# starting safe_asterisk when Asterisk is running is very bad.
VERSION=`/usr/sbin/asterisk -rx 'core show version'`
if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
echo "Asterisk is already running. $0 will exit now."
exit 1
fi
echo "Starting Asterisk /usr/sbin/asterisk"
/usr/sbin/asterisk
fi

@ -63,6 +63,15 @@ RETVAL=0
start() {
# Start daemons.
# Check if Asterisk is already running. If it is, then bug out, because
# starting Asterisk when Asterisk is already running is very bad.
VERSION=`/usr/sbin/asterisk -rx 'core show version'`
if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
echo "Asterisk is already running. $0 will exit now."
exit 1
fi
echo -n $"Starting asterisk: "
if [ -f $SAFE_ASTERISK ] ; then
DAEMON=$SAFE_ASTERISK

@ -38,6 +38,14 @@ function message() {
fi
}
# Check if Asterisk is already running. If it is, then bug out, because
# starting safe_asterisk when Asterisk is running is very bad.
VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version'`
if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
message "Asterisk is already running. $0 will exit now."
exit 1
fi
# since we're going to change priority and open files limits, we need to be
# root. if running asterisk as other users, pass that to asterisk on the command
# line.

Loading…
Cancel
Save