0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update run_server script from production

Browse source
This commit is contained in:
Ignacio R. Morelle 2014-02-08 08:02:45 -03:00
parent 01a6a3bb1d
commit 7e7a32447e
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
utils/mp-server/run_server
View file

@ -21,7 +21,7 @@ if [ $# -ge 1 ] && [ "$1" = "--test" ]; then
shift
PARAMETERS="$@"
cd "$SERVERBASE"/build || exit 1
bin/wesnothd-$SERVER -c "$SERVERBASE"/wesnothd.cfg --port 14990 $PARAMETERS
bin/wesnothd-$SERVER -c "$SERVERBASE"/wesnothd.cfg --port 15001 $PARAMETERS
# remove the socket so it looks like we never ran the server
rm var/run/socket
exit 0
@ -31,21 +31,25 @@ PARAMETERS="$@"
THREADS=4
PORT=15000
case $SERVER in
1.4) PORT=14998
THREADS=32 ;;
1.4|1.8)
PORT=14998
THREADS=30 ;;
1.6) PORT=14999
THREADS=32 ;;
THREADS=8 ;;
1.5*) PORT=14999
THREADS=16 ;;
1.7*) PORT=14997
THREADS=16 ;;
1.9*) PORT=14997
THREADS=16 ;;
esac
ulimit -Ss 2048
ulimit -c unlimited
# send the standard server message to the appropriate server when killing it with ctrl+c
trap "$HOME/bin/send_server_message $SERVER; sleep 2; echo -n 'terminated: '; date; exit 0" INT
#trap "$HOME/bin/send_server_message $SERVER; sleep 2; echo -n 'terminated: '; date; exit 0" INT
trap "echo -n 'terminated: '; date; exit 0" INT
while [ true ]
do
@ -55,14 +59,15 @@ do
DATE=$(date +"%Y%m%d-%H%M%S")
[ -r "$SERVERBASE"/redirect.cfg ] && PORT=$(sed -nre '/port=/s/[ \t]*port="?([0-9]+)"?/\1/p' "$SERVERBASE"/redirect.cfg)
BUILDDIR=$(readlink "$SERVERBASE"/build)
REV=r$(echo $BUILDDIR | sed -nre "s,.*wesnothd-dev-([0-9:SM]+)_$SERVER$,\1,p")
#REV=r$(echo $BUILDDIR | sed -nre "s,.*wesnothd-svn-([0-9:SM]+)_$SERVER$,\1,p")
REV=$(echo $BUILDDIR | sed -nre "s,.*wesnothd-$SERVER-git-(.*)$,\1,p")
LOG="wesnothd.$DATE.$REV.log"
bin/wesnothd-$SERVER -c "$SERVERBASE"/wesnothd.cfg --port $PORT --threads $THREADS $PARAMETERS > "$SERVERBASE/logs/$LOG" 2>&1 &
PID=$!
echo "started $SERVER server with command: 'wesnothd-$SERVER -c \"$SERVERBASE\"/wesnothd.cfg --port $PORT --threads $THREADS $PARAMETERS' (revision: $REV, pid: $PID) logging to: $LOG"
echo "started $SERVER server with command: 'wesnothd-$SERVER -c \"$SERVERBASE\"/wesnothd.cfg --port $PORT --threads $THREADS $PARAMETERS' (commit: $REV, pid: $PID) logging to: $LOG"
# wait a bit in case the process dies immediately
sleep 5
if jobs -l | grep Running
if ps -p $PID > /dev/null 2>&1
then # create some convenient links
ln -s "$SERVERBASE/logs/$LOG" "$LOG.$PID"
rm -f "$SERVERBASE"/old.log "$SERVERBASE"/old.pid
@ -83,4 +88,7 @@ do
0) exit ;;
98|127|128) dietail ;; #Could not bind to port #Command not found #Invalid argument to exit
esac
tail "$SERVERBASE/logs/$LOG"
echo
done