BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3505 from ffdixon/update-bbb-conf

Browse Source 
Updated bbb-conf to detect problems with FS on 8021
This commit is contained in:
Fred Dixon 2016-12-08 13:11:24 -05:00 committed by GitHub
commit cc721887a4
1 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
bigbluebutton-config/bin/bbb-conf
View File

@ -145,12 +145,10 @@ VOICE_CONFERENCE="bbb-voice-freeswitch.xml"
# Determine IP so it works on multilingual installations
#
if [[ `sudo ifconfig` == *venet0:0* ]]; then
# IP detection for OpenVZ environment
IP=$(ifconfig | grep -v '127.0.0.1' | grep -E "[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" | tail -1 | cut -d: -f2 | awk '{ print $1}')
if ifconfig eth0 > /dev/null 2>&1; then
IP=$(LANG=c ifconfig eth0 | grep "inet addr" | awk -F: '{print $2}' | awk '{print $1}')
else
# IP detection for regular environment
IP=$(ifconfig | grep -v '127.0.0.1' | grep -E "[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" | head -1 | cut -d: -f2 | awk '{ print $1}')
IP=$(ifconfig | grep -v '127.0.0.1' | grep -E "[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" | tail -1 | cut -d: -f2 | awk '{ print $1}')
fi
MEM=`free -m | grep Mem | awk '{ print $2}'`
@ -1078,7 +1076,7 @@ check_state() {
COUNT=0
while [ $COUNT -lt 20 ]; do
let COUNT=COUNT+1
if ! cat $RED5_DIR/log/bigbluebutton.log | tail -n10 | grep -q "Starting up context"; then
if ! cat $RED5_DIR/log/bigbluebutton.log | grep -q "Starting up context"; then
echo -n "."
sleep 1
else
@ -1090,14 +1088,41 @@ check_state() {
BBB_APPS="sip video bigbluebutton screenshare-slf"
for bbb_app in $BBB_APPS ; do
if [ -a $RED5_DIR/log/$bbb_app.log ]; then
if cat $RED5_DIR/log/$bbb_app.log | tail -n1 | grep -q "Starting up context"; then
echo "# $bbb_app did not start properly"
if cat $RED5_DIR/log/$bbb_app.log | grep -q "Starting up context"; then
echo "# $bbb_app may not have started properly"
fi
else
echo "# $RED5_DIR/log/$bbb_app.log not found"
fi
done
#
# Check FreeSWITCH
#
if grep -q "Thread ended for mod_event_socket" /opt/freeswitch/var/log/freeswitch/freeswitch.log; then
echo
echo "# Error: Found text in freeswitch.log:"
echo "#"
echo "# Thread ended for mod_event_socket"
echo "#"
echo "# FreeSWITCH may not be responding to requests on port 8021 (event socket layer)"
echo "# and users may have errors joining audio."
echo "#"
fi
#
# Check FreeSWITCH
#
if ! echo "/quit" | /opt/freeswitch/bin/fs_cli - > /dev/null 2>&1; then
echo
echo "#"
echo "# Error: Unable to connect to the FreeSWITCH Event Socket Layer on port 8021"
echo "#"
fi
#
# Check for required external commands
#
@ -1134,7 +1159,7 @@ check_state() {
# Checking if voice app registered successfully
#
if cat /usr/share/red5/log/sip.log | grep -q "Failed to register with Sip Server"; then
echo "# Error: The voice application failed to register with the sip server."
echo "# Warning: The voice application may not have registered with the sip server."
echo "# Try running: "
echo "#"
echo "# sudo bbb-conf --clean"
@ -1151,7 +1176,8 @@ check_state() {
echo
fi
else
echo "# Error: /usr/share/red5/log/sip.log"
echo "# Error: The following log file was not found"
echo "# /usr/share/red5/log/sip.log "
echo
fi
@ -1169,7 +1195,7 @@ check_state() {
if [ -f $RED5_DIR/log/bigbluebutton.log ]; then
BBB_RED5_LOG=$(stat -c%s $RED5_DIR/log/bigbluebutton.log)
if [ $BBB_RED5_LOG -lt 100 ]; then
echo "# bigbluebutton failed to start: $RED5_DIR/log/bigbluebutton.log (red5)"
echo "# Log file too short (less than 100 lines): $RED5_DIR/log/bigbluebutton.log (red5)"
fi
else
echo "# No $RED5_DIR/log/bigbluebutton.log"
@ -1318,7 +1344,6 @@ check_state() {
echo
fi
if [ -f ${SERVLET_DIR}/demo/demo1.jsp ]; then
BBB_WEB_URL=$(cat ${SERVLET_DIR}/bigbluebutton/WEB-INF/classes/bigbluebutton.properties | grep -v '#' | sed -n '/^bigbluebutton.web.serverURL/{s/.*=//;p}')
echo "# Warning: The API demos are installed and accessible from:"