gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed monitor issues ts3server 

* Fixed bug where monitor did not always work
* Minor code tidy up
pull/30/head
Daniel Gibbs 12 years ago
parent
aee07cdd93
commit
3b94df4a13
2 changed files with 13 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      Mumble/mumbleserver
  2. 12
      TeamSpeak3/ts3server

15
Mumble/mumbleserver
View File

@ -3,7 +3,7 @@
# Server Management Script # Server Management Script
# Author: Daniel Gibbs # Author: Daniel Gibbs
# Website: http://danielgibbs.co.uk # Website: http://danielgibbs.co.uk
# Version: 180813 # Version: 101113
### Variables #### ### Variables ####
@ -12,11 +12,10 @@
emailnotification="off" emailnotification="off"
email="email@example.com" email="email@example.com"
# Server names # Server Details
servername="Mumble" servername="Mumble"
servicename="mumble-server" servicename="mumble-server"
# Directorys
# Directorys # Directorys
rootdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" rootdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
selfname="$0" selfname="$0"
@ -50,7 +49,7 @@ fi
fn_runcheck(){ fn_runcheck(){
# already running check # already running check
pidwc=`screen -ls |grep ${servicename} |awk -F . '{print $1}'|awk '{print $1}'|wc -l` pidwc=$(screen -ls |grep ${servicename} |awk -F . '{print $1}'|awk '{print $1}'|wc -l)
if [ ${pidwc} -eq 1 ];then if [ ${pidwc} -eq 1 ];then
echo -e "[\e[0;36m INFO \e[0;39m] ${servicename}: ${servername} is already running" echo -e "[\e[0;36m INFO \e[0;39m] ${servicename}: ${servername} is already running"
echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already running" >> ${logfile} echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already running" >> ${logfile}
@ -81,7 +80,7 @@ if [ -f /etc/lsb-release ]; then
elif [ -f /etc/debian_version ]; then elif [ -f /etc/debian_version ]; then
os="Debian $(cat /etc/debian_version)" os="Debian $(cat /etc/debian_version)"
elif [ -f /etc/redhat-release ]; then elif [ -f /etc/redhat-release ]; then
os=`cat /etc/redhat-release` os=$(cat /etc/redhat-release)
else else
os="$(uname -s) $(uname -r)" os="$(uname -s) $(uname -r)"
fi fi
@ -149,7 +148,7 @@ if [ `find ${logdir}/* -mtime +${logdays} |wc -l` -ne "0" ];then
echo -e "[\e[0;36m INFO \e[0;39m] Removing logs older than ${logdays} days" echo -e "[\e[0;36m INFO \e[0;39m] Removing logs older than ${logdays} days"
echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Removing logs older than ${logdays} days" >> ${logfile} echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Removing logs older than ${logdays} days" >> ${logfile}
find ${logdir}/* -mtime +${logdays} |tee >> ${logfile} find ${logdir}/* -mtime +${logdays} |tee >> ${logfile}
count=`find ${logdir}/* -mtime +${logdays}|wc -l` count=$(find ${logdir}/* -mtime +${logdays}|wc -l)
find ${logdir}/* -mtime +${logdays} -exec rm {} \; find ${logdir}/* -mtime +${logdays} -exec rm {} \;
echo -e "[\e[0;36m INFO \e[0;39m] Log cleaner removed ${count} log files" echo -e "[\e[0;36m INFO \e[0;39m] Log cleaner removed ${count} log files"
echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Log cleaner removed ${count} log files" >> ${logfile} echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Log cleaner removed ${count} log files" >> ${logfile}
@ -183,7 +182,7 @@ echo -e "[\e[0;32m OK \e[0;39m] Starting ${servicename}: ${servername}"
echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Starting ${servername}" >> ${logfile} echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Starting ${servername}" >> ${logfile}
screen -d -m -S ${servicename} ./murmur.x86 -fg -ini ${ini} screen -d -m -S ${servicename} ./murmur.x86 -fg -ini ${ini}
sleep 1 sleep 1
pidwc=`screen -ls |grep ${servicename} |awk -F . '{print $1}'|awk '{print $1}'|wc -l` pidwc=$(screen -ls |grep ${servicename} |awk -F . '{print $1}'|awk '{print $1}'|wc -l)
if [ ${pidwc} -eq 0 ];then if [ ${pidwc} -eq 0 ];then
echo -e "[\e[0;31m FAIL \e[0;39m] ${servicename}: ${servername} failed to start" echo -e "[\e[0;31m FAIL \e[0;39m] ${servicename}: ${servername} failed to start"
echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} failed to start" >> ${logfile} echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} failed to start" >> ${logfile}
@ -193,7 +192,7 @@ fi
fn_stopserver(){ fn_stopserver(){
fn_rootcheck fn_rootcheck
fn_syscheck fn_syscheck
pid=`screen -ls |grep ${servicename} |awk -F . '{print $1}'|awk '{print $1}'` pid=$(screen -ls |grep ${servicename} |awk -F . '{print $1}'|awk '{print $1}')
if [ -z ${pid} ];then if [ -z ${pid} ];then
echo -e "[\e[0;36m INFO \e[0;39m] ${servicename}: ${servername} is already stopped" echo -e "[\e[0;36m INFO \e[0;39m] ${servicename}: ${servername} is already stopped"
echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${logfile} echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: ${servername} is already stopped" >> ${logfile}

12
TeamSpeak3/ts3server
View File

@ -3,7 +3,7 @@
# Server Management Script # Server Management Script
# Author: Daniel Gibbs # Author: Daniel Gibbs
# Website: http://danielgibbs.co.uk # Website: http://danielgibbs.co.uk
# Version: 010813 # Version: 101113
#### Variables #### #### Variables ####
@ -12,7 +12,7 @@
emailnotification="off" emailnotification="off"
email="email@example.com" email="email@example.com"
# Server names # Server Details
gamename="Teamspeak 3" gamename="Teamspeak 3"
servername="Teamspeak 3 Server" servername="Teamspeak 3 Server"
servicename="ts3-server" servicename="ts3-server"
@ -81,7 +81,7 @@ if [ -f /etc/lsb-release ]; then
elif [ -f /etc/debian_version ]; then elif [ -f /etc/debian_version ]; then
os="Debian $(cat /etc/debian_version)" os="Debian $(cat /etc/debian_version)"
elif [ -f /etc/redhat-release ]; then elif [ -f /etc/redhat-release ]; then
os=`cat /etc/redhat-release` os=$(cat /etc/redhat-release)
else else
os="$(uname -s) $(uname -r)" os="$(uname -s) $(uname -r)"
fi fi
@ -160,7 +160,7 @@ if [ `find ${scriptlogdir}/* -mtime +${logdays} |wc -l` -ne "0" ];then
echo -e "[\e[0;36m INFO \e[0;39m] Removing logs older than ${logdays} days" echo -e "[\e[0;36m INFO \e[0;39m] Removing logs older than ${logdays} days"
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: Removing logs older than ${logdays} days" >> ${scriptlog} echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: Removing logs older than ${logdays} days" >> ${scriptlog}
find ${scriptlogdir}/* -mtime +${logdays} |tee >> ${scriptlog} find ${scriptlogdir}/* -mtime +${logdays} |tee >> ${scriptlog}
count=`find ${scriptlogdir}/* -mtime +${logdays}|wc -l` count=$(find ${scriptlogdir}/* -mtime +${logdays}|wc -l)
find ${scriptlogdir}/* -mtime +${logdays} -exec rm {} \; find ${scriptlogdir}/* -mtime +${logdays} -exec rm {} \;
echo -e "[\e[0;36m INFO \e[0;39m] Log cleaner removed ${count} log files" echo -e "[\e[0;36m INFO \e[0;39m] Log cleaner removed ${count} log files"
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: Log cleaner removed ${count} log files" >> ${scriptlog} echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: Log cleaner removed ${count} log files" >> ${scriptlog}
@ -234,7 +234,7 @@ fn_runcheck
echo -en "\r[\e[1;33m WARN \e[0;39m] ${servicename}: Monitor detected ${servername} had stopped!\n" echo -en "\r[\e[1;33m WARN \e[0;39m] ${servicename}: Monitor detected ${servername} had stopped!\n"
echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Monitor detected ${servername} had stopped!" >> ${scriptlog} echo -e "$( date '+%b %d %H:%M:%S') ${servicename}: Monitor detected ${servername} had stopped!" >> ${scriptlog}
sleep 1 sleep 1
ts3status=`${filesdir}/ts3server_startscript.sh status inifile=${ini}` fn_status
if [ "$ts3status" = "Server seems to have died" ];then if [ "$ts3status" = "Server seems to have died" ];then
echo -en "[\e[0;36m INFO \e[0;39m] ${servicename}: ${servername} Server seems to have died" echo -en "[\e[0;36m INFO \e[0;39m] ${servicename}: ${servername} Server seems to have died"
echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${servername} Server seems to have died" >> ${scriptlog} echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${servername} Server seems to have died" >> ${scriptlog}
@ -261,7 +261,7 @@ fn_restartserver
} }
fn_status(){ fn_status(){
ts3status=`${filesdir}/ts3server_startscript.sh status inifile=${ini} > /dev/null 2>&1` ts3status=$(${filesdir}/ts3server_startscript.sh status inifile=${ini})
} }
case "$1" in case "$1" in

Write Preview
Loading…
Cancel
Save