Add old PID file; remove PID files on stop

This commit is contained in:
Ben Peddell 2016-09-17 20:18:46 +10:00
parent 5770903960
commit 437d628a00

View File

@ -513,6 +513,14 @@ function getServerPID(){
return
fi
fi
if [ -f "${arkserverroot}/${arkserveroldpidfile}" ]; then
serverpid="$(<"${arkserverroot}/${arkserveroldpidfile}")"
if kill -0 "$serverpid" >/dev/null 2>&1; then
echo $serverpid
return
fi
fi
if [ -z "$arkopt_clusterid" ]; then
ps -ef | grep "$arkserverroot/$arkserverexec" | grep -v grep | awk '{print $2}'
fi
@ -996,6 +1004,10 @@ doStop() {
fi
fi
rm -f "${arkserverroot}/${arkserverpidfile}"
rm -f "${arkserverroot}/${arkserveroldpidfile}"
rm -f "${arkserverroot}/${arkmanagerpidfile}"
tput rc; tput ed;
echo "The server has been stopped"
echo "`timestamp`: stopped" >> "$logdir/$arkmanagerLog"
@ -2375,6 +2387,7 @@ useConfig() {
fi
arkautorestartfile="${arkautorestartfile:-ShooterGame/Saved/.autorestart-${1}}"
arkserverpidfile="${arkserverpidfile:-ShooterGame/Saved/.arkserver-${1}.pid}"
arkserveroldpidfile="ShooterGame/Saved/.arkserver.pid"
arkmanagerpidfile="${arkmanagerpidfile:-ShooterGame/Saved/.arkmanager-${1}.pid}"
}