Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

This commit is contained in:
deniszgonjanin 2010-08-24 19:37:27 +00:00
commit 31b2fea237

View File

@ -702,18 +702,26 @@ check_state() {
RUNNING_APPS="${RUNNING_APPS} Red5" RUNNING_APPS="${RUNNING_APPS} Red5"
fi fi
if ! ps aux | grep -v grep | grep '[/]usr/sbin/asterisk' > /dev/null; then #check asterisk if asterisk has been started
#same for freeswitch
if [ -a /var/run/asterisk/asterisk.pid ] && [ -a /opt/freeswitch/run/freeswitch.pid ]; then
print_header print_header
NOT_RUNNING_APPS="${NOT_RUNNING_APPS} Asterisk" echo "Asterisk and Freeswitch are running parallel"
else echo "Please run bbb-conf freeswitch or bbb-conf asterisk"
RUNNING_APPS="${RUNNING_APPS} Asterisk" elif [ -a /var/run/asterisk/asterisk.pid ]; then
fi if ! ps aux | grep -v grep | grep '[/]usr/sbin/asterisk' > /dev/null; then
print_header
if ! ps aux | grep -v grep | grep '[/]opt/freeswitch/bin/freeswitch' > /dev/null; then NOT_RUNNING_APPS="${NOT_RUNNING_APPS} Asterisk"
print_header else
NOT_RUNNING_APPS="${NOT_RUNNING_APPS} freeswitch" RUNNING_APPS="${RUNNING_APPS} Asterisk"
else fi
RUNNING_APPS="${RUNNING_APPS} freeswitch" elif [ -a /opt/freeswitch/run/freeswitch.pid ]; then
if ! ps aux | grep -v grep | grep '[/]opt/freeswitch/bin/freeswitch' > /dev/null; then
print_header
NOT_RUNNING_APPS="${NOT_RUNNING_APPS} Freeswitch"
else
RUNNING_APPS="${RUNNING_APPS} Freeswitch"
fi
fi fi
if ! ps aux | grep -v grep | grep '[/]/usr/lib/openoffice/program/soffice.bin' > /dev/null; then if ! ps aux | grep -v grep | grep '[/]/usr/lib/openoffice/program/soffice.bin' > /dev/null; then