diff --git a/Arma3/arma3server b/Arma3/arma3server index 557fe4f7a..2ea8f8f81 100644 --- a/Arma3/arma3server +++ b/Arma3/arma3server @@ -4,7 +4,7 @@ # Author: Daniel Gibbs # Contributor: Scarsz # Website: http://danielgibbs.co.uk -# Version: 011014 +# Version: 061014 #### Variables #### @@ -606,8 +606,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -618,13 +618,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" @@ -782,13 +788,14 @@ echo "Downloading CONFIG_Vanilla.cfg" echo "=================================" sleep 1 cd "${systemdir}" -wget -nv https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/Arma3/CONFIG_Vanilla.cfg +wget -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/Arma3/CONFIG_Vanilla.cfg echo "Creating ${servicename}.cfg config file." sleep 1 cp -v CONFIG_Vanilla.cfg ${servercfgfullpath} sleep 1 echo "" } + fn_header(){ clear echo "=================================" @@ -967,4 +974,4 @@ case "$1" in echo "Usage: $0 {start|stop|restart|update|update-restart|validate|validate-restart|monitor|email-test|details|backup|console|debug|install}" exit 1;; esac -exit \ No newline at end of file +exit diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver index 05d40e034..d56a0c08c 100644 --- a/BladeSymphony/bsserver +++ b/BladeSymphony/bsserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -76,7 +76,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -417,6 +417,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -489,7 +491,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -599,6 +602,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -606,8 +610,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -618,13 +622,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/CounterStrike/csserver b/CounterStrike/csserver index 8a0fec42a..2217b600c 100644 --- a/CounterStrike/csserver +++ b/CounterStrike/csserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -416,6 +416,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -488,7 +490,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -598,6 +601,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -605,8 +609,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -617,13 +621,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver index 8064c0ab9..ffa39c656 100644 --- a/CounterStrikeConditionZero/csczserver +++ b/CounterStrikeConditionZero/csczserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -75,7 +75,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -416,6 +416,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -488,7 +490,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -598,6 +601,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -605,8 +609,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -617,13 +621,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver index 39b38f690..80bf4ef01 100644 --- a/CounterStrikeGlobalOffensive/csgoserver +++ b/CounterStrikeGlobalOffensive/csgoserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -93,7 +93,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -434,6 +434,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -506,7 +508,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -617,6 +620,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -624,8 +628,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -636,13 +640,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver index 7524476f6..facbd449b 100644 --- a/CounterStrikeSource/cssserver +++ b/CounterStrikeSource/cssserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -76,7 +76,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -417,6 +417,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -489,7 +491,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -599,6 +602,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -606,8 +610,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -618,13 +622,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/DayOfDefeat/dodserver b/DayOfDefeat/dodserver index 8d0573c8f..f20a8dbda 100644 --- a/DayOfDefeat/dodserver +++ b/DayOfDefeat/dodserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -75,7 +75,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -416,6 +416,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -488,7 +490,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -598,6 +601,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -605,8 +609,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -617,13 +621,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver index 63721b745..ff8431a03 100644 --- a/DayOfDefeatSource/dodsserver +++ b/DayOfDefeatSource/dodsserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -76,7 +76,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -417,6 +417,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -489,7 +491,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -599,6 +602,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -606,8 +610,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -618,13 +622,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/FistfulOfFrags/fofserver b/FistfulOfFrags/fofserver index b520e89e9..5576795f5 100644 --- a/FistfulOfFrags/fofserver +++ b/FistfulOfFrags/fofserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -76,7 +76,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -417,6 +417,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -489,7 +491,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -599,6 +602,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -606,8 +610,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -618,13 +622,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver index 196357bb6..c826a7ee8 100644 --- a/GarrysMod/gmodserver +++ b/GarrysMod/gmodserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -81,7 +81,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -422,6 +422,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -494,7 +496,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -604,6 +607,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -611,8 +615,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -623,13 +627,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" @@ -883,7 +893,7 @@ fn_getquery(){ while true; do read -p "Do you want to install GameServerQuery? [y/N]" yn case $yn in - [Yy]* ) wget -nv -N "http://danielgibbs.co.uk/dl/gsquery.py"; chmod +x gsquery.py;break;; + [Yy]* ) cd "${rootdir}"; wget -nv -N "http://danielgibbs.co.uk/dl/gsquery.py"; chmod +x gsquery.py; break;; [Nn]* ) echo -e "Not installing GameServerQuery.";break;; * ) echo "Please answer yes or no.";; esac diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver index a006d7b7c..8d5cfe1a9 100644 --- a/HalfLife2Deathmatch/hl2dmserver +++ b/HalfLife2Deathmatch/hl2dmserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -76,7 +76,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -417,6 +417,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -489,7 +491,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -599,6 +602,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -606,8 +610,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -618,13 +622,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/HalfLifeDeathmatchClassic/hldmcserver b/HalfLifeDeathmatchClassic/hldmcserver index faec6c030..2bbe03dbe 100644 --- a/HalfLifeDeathmatchClassic/hldmcserver +++ b/HalfLifeDeathmatchClassic/hldmcserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -75,7 +75,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -416,6 +416,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -488,7 +490,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -598,6 +601,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -605,8 +609,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -617,13 +621,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/Insurgency/insserver b/Insurgency/insserver index 22f2c4488..d2c85deee 100644 --- a/Insurgency/insserver +++ b/Insurgency/insserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -76,7 +76,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -417,6 +417,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -489,7 +491,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -599,6 +602,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -606,8 +610,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -618,13 +622,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/JustCause2/jc2server b/JustCause2/jc2server index e08b690ba..900b51f5d 100644 --- a/JustCause2/jc2server +++ b/JustCause2/jc2server @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 031014 +# Version: 061014 #### Variables #### @@ -70,7 +70,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -411,6 +411,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -418,7 +420,6 @@ if [ -f gsquery.py ]; then fn_printdots "Monitoring ${servicename}: Querying port: ${ip}:${port}: QUERYING" fn_scriptlog "Querying port: ${ip}:${port}: QUERYING" sleep 1 - echo "./gsquery.py -a ${ip} -p ${port} -e ${engine} 2>&1" serverquery=$(./gsquery.py -a ${ip} -p ${port} -e ${engine} 2>&1) exitcode=$? if [ "${exitcode}" == "1" ]||[ "${exitcode}" == "2" ]||[ "${exitcode}" == "3" ]||[ "${exitcode}" == "4" ]; then @@ -484,7 +485,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -594,6 +596,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -601,8 +604,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -613,13 +616,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" @@ -628,7 +637,7 @@ sleep 1 echo -en "\n" } -fn_details(){ +fn_jc2details(){ fn_autoip servername=$(grep -s hostname "${servercfgfullpath}"|sed 's/hostname //g'|sed 's/"//g') pid=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) @@ -803,7 +812,7 @@ fn_getquery echo "" fn_header sleep 1 - fn_details + fn_jc2details sleep 1 echo "=================================" echo "Install Complete!" @@ -850,4 +859,4 @@ case "$1" in echo "Usage: $0 {start|stop|restart|update|update-restart|validate|validate-restart|monitor|email-test|details|backup|console|debug|install}" exit 1;; esac -exit +exit \ No newline at end of file diff --git a/KillingFloor/kfserver b/KillingFloor/kfserver index bae4f4d7f..5939f8bd3 100644 --- a/KillingFloor/kfserver +++ b/KillingFloor/kfserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -70,7 +70,7 @@ parms="server ${defaultmap}?game=KFmod.KFGameType?VACSecured=true -nohomedir ini # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -411,6 +411,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -483,7 +485,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -593,6 +596,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -600,8 +604,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -612,13 +616,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/Left4Dead/l4dserver b/Left4Dead/l4dserver index fa41ba9c9..65b89dc55 100644 --- a/Left4Dead/l4dserver +++ b/Left4Dead/l4dserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -75,7 +75,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -416,6 +416,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -488,7 +490,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -598,6 +601,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -605,8 +609,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -617,13 +621,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server index ca35f0332..aea00cfdb 100644 --- a/Left4Dead2/l4d2server +++ b/Left4Dead2/l4d2server @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -76,7 +76,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -417,6 +417,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -489,7 +491,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -599,6 +602,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -606,8 +610,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -618,13 +622,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server index 95250b976..bee9dbcec 100644 --- a/NaturalSelection2/ns2server +++ b/NaturalSelection2/ns2server @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -75,7 +75,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -416,6 +416,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -488,7 +490,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -598,6 +601,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -605,8 +609,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -617,13 +621,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver index 47bec526e..fc866ca7f 100644 --- a/NoMoreRoomInHell/nmrihserver +++ b/NoMoreRoomInHell/nmrihserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -76,7 +76,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -417,6 +417,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -489,7 +491,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -599,6 +602,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -606,8 +610,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -618,13 +622,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/RedOrchestra/roserver b/RedOrchestra/roserver index 7623f0665..fa50269f2 100644 --- a/RedOrchestra/roserver +++ b/RedOrchestra/roserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -66,7 +66,7 @@ parms="server ${defaultmap}?game=ROGame.ROTeamGame?VACSecured=true -nohomedir in # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -407,6 +407,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -479,7 +481,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -589,6 +592,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -596,8 +600,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -608,13 +612,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server index 35045c15b..7d9c206a8 100644 --- a/TeamFortress2/tf2server +++ b/TeamFortress2/tf2server @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -76,7 +76,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -417,6 +417,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -489,7 +491,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -599,6 +602,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -606,8 +610,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -618,13 +622,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/TeamFortressClassic/tfcserver b/TeamFortressClassic/tfcserver index 098302f41..2ae86e816 100644 --- a/TeamFortressClassic/tfcserver +++ b/TeamFortressClassic/tfcserver @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -75,7 +75,7 @@ consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%d-%m-%Y-%H-%M- # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -416,6 +416,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -488,7 +490,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -598,6 +601,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -605,8 +609,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -617,13 +621,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" diff --git a/UnrealTournament2004/ut2k4server b/UnrealTournament2004/ut2k4server index 99fbd4504..00654ca10 100644 --- a/UnrealTournament2004/ut2k4server +++ b/UnrealTournament2004/ut2k4server @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -59,7 +59,7 @@ parms="server ${defaultmap}?game=XGame.xDeathMatch -nohomedir ini=${ini} log=${g # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -400,6 +400,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -472,7 +474,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -550,6 +553,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -557,8 +561,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -569,13 +573,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" @@ -702,7 +712,7 @@ cd "${rootdir}" mkdir -pv "${filesdir}" cd "${filesdir}" if [ ! -f dedicatedserver3339-bonuspack.zip ]; then - wget http://downloads.unrealadmin.org/UT2004/Server/dedicatedserver3339-bonuspack.zip + wget -nv -N http://downloads.unrealadmin.org/UT2004/Server/dedicatedserver3339-bonuspack.zip else echo "dedicatedserver3339-bonuspack.zip already downloaded!" fi @@ -723,7 +733,7 @@ else echo "MD5 checksum: PASSED" fi if [ ! -f ut2004-lnxpatch3369-2.tar.bz2 ]; then - wget http://downloads.unrealadmin.org/UT2004/Patches/Linux/ut2004-lnxpatch3369-2.tar.bz2 + wget -nv -N http://downloads.unrealadmin.org/UT2004/Patches/Linux/ut2004-lnxpatch3369-2.tar.bz2 else echo "ut2004-lnxpatch3369-2.tar.bz2 already downloaded!" fi diff --git a/UnrealTournament99/ut99server b/UnrealTournament99/ut99server index 1509e727c..646be59a6 100644 --- a/UnrealTournament99/ut99server +++ b/UnrealTournament99/ut99server @@ -3,7 +3,7 @@ # Server Management Script # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 200914 +# Version: 061014 #### Variables #### @@ -56,7 +56,7 @@ parms="server ${defaultmap}.unr ini=${systemdir}/${ini}" # what you are doing fn_scriptlog(){ - echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: '$1'" >> ${scriptlog} + echo -e "$(date '+%b %d %H:%M:%S') ${servicename}: ${1}" >> ${scriptlog} } # [ FAIL ] @@ -397,6 +397,8 @@ if [ -f gsquery.py ]; then port=$((${gameport} + 1)) elif [ "${engine}" == "spark" ]; then port=$((${port} + 1)) + elif [ "${engine}" == "realvirtuality" ]; then + port=${queryport} fi fn_printinfo "Monitoring ${servicename}: Detected gsquery.py" fn_scriptlog "Detected gsquery.py" @@ -469,7 +471,8 @@ fn_printdots "Monitoring ${servicename}: ${servername}" fn_scriptlog "Monitoring ${servername}" sleep 1 if [ ! -f ${lockselfname} ]; then - fn_printinfo "Monitoring ${servicename}: No lock file found: Monitor disabled" + fn_printinfo "Monitoring ${servicename}: Monitor disabled: No lock file found" + fn_scriptlog "Monitor disabled: No lock file found" sleep 1 echo -en "\n" echo "To enable monitor run ${selfname} start" @@ -547,6 +550,7 @@ fn_parms fn_logmanager tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -v failed|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then + fn_scriptlog "Rotating log files" if [ "${engine}" == "unreal2" ]; then mv "${gamelog}" "${gamelogdate}" fi @@ -554,8 +558,8 @@ if [ ${tmuxwc} -eq 0 ]; then mv "${consolelog}" "${consolelogdate}" fi fn_printdots "Starting ${servicename}: ${servername}" -sleep 1 fn_scriptlog "Starting ${servername}" +sleep 1 if [ ${tmuxwc} -eq 1 ]; then fn_printinfo "Starting ${servicename}: ${servername} is already running" fn_scriptlog "${servername} is already running" @@ -566,13 +570,19 @@ fi # Create lock file date > "${rootdir}/${lockselfname}" cd "${executabledir}" -tmux new-session -d -s ${servicename} "${executable} ${parms}" +tmux new-session -d -s ${servicename} "${executable} ${parms}" 2> ${scriptlogdir}/.${servicename}-tmux-error.tmp tmux pipe-pane -o -t ${servicename} "exec cat >> '${consolelog}'" sleep 1 tmuxwc=$(tmux list-sessions 2>&1|awk '{print $1}'|grep -E "^${servicename}:"|wc -l) if [ ${tmuxwc} -eq 0 ]; then - fn_printfail "Starting ${servicename}: Failed to start ${servername}" + fn_printfailnl "Starting ${servicename}: Failed to start ${servername}" + echo -en " Check log files: ${rootdir}/log" fn_scriptlog "failed to start ${servername}" + if [ -a ${scriptlogdir}/.${servicename}-tmux-error.tmp ]; then + fn_scriptlog "tmux returned the following error" + cat ${scriptlogdir}/.${servicename}-tmux-error.tmp >> ${scriptlog} + rm ${scriptlogdir}/.${servicename}-tmux-error.tmp + fi else fn_printok "Starting ${servicename}: ${servername}" fn_scriptlog "Started ${servername}" @@ -695,7 +705,7 @@ cd "${rootdir}" mkdir -pv "${filesdir}" cd "${filesdir}" if [ ! -f ut-server-436.tar.gz ]; then - wget http://danielgibbs.co.uk/wp-content/uploads/ut-server-436.tar.gz + wget -nv -N http://danielgibbs.co.uk/wp-content/uploads/ut-server-436.tar.gz else echo "ut-server-436.tar.gz already downloaded!" fi @@ -716,7 +726,7 @@ else echo "MD5 checksum: PASSED" fi if [ ! -f UTPGPatch451.tar.bz2 ]; then - wget http://danielgibbs.co.uk/wp-content/uploads/UTPGPatch451.tar.bz2 + wget -nv -N http://danielgibbs.co.uk/wp-content/uploads/UTPGPatch451.tar.bz2 else echo "UTPGPatch451.tar.bz2 already downloaded!" fi