elias/ark-ac-server-tools
1
0
Fork 0
mirror of https://github.com/eliasstepanik/ark-ac-server-tools.git synced 2026-01-14 19:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #567 from klightspeed/prevent-start-during-update

Browse Source 
Prevent server start during update
This commit is contained in:
Ben Peddell 2016-08-21 22:30:58 +10:00 committed by GitHub
commit 97875f88aa
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/arkmanager
View File

@ -591,6 +591,14 @@ function numPlayersConnected(){
doRun() {
cd "$arkserverroot"
if [ -f "${arkserverroot}/.ark-update.lock" ]; then
local updatepid="$(<"${arkserverroot}/.ark-update.lock")"
if kill -0 "$updatepid" >/dev/null 2>&1; then
echo "An update is currently in progress. Start aborted"
return 1
fi
fi
arkserveropts="$serverMap"
if [ -n "$serverMapModId" ]; then
@ -728,6 +736,15 @@ doRun() {
# start function
#
doStart() {
if [ -f "${arkserverroot}/.ark-update.lock" ]; then
local updatepid="$(<"${arkserverroot}/.ark-update.lock")"
if kill -0 "$updatepid" >/dev/null 2>&1; then
touch "${arkserverroot}/.startAfterUpdate"
echo "An update is currently in progress. Start aborted"
return 1
fi
fi
if isTheServerRunning; then
echo "The server is already running"
else
@ -766,6 +783,8 @@ doStartAll(){
# stop the ARK server
#
doStop() {
rm -f "${arkserverroot}/.startAfterUpdate"
if isTheServerRunning; then
if [[ " $* " =~ " --warn " ]]; then
doWarn "$1"
@ -1151,7 +1170,9 @@ doUpdate() {
fi
# we restart the server only if it was started before the update
if [ $serverWasAlive -eq 1 ]; then
if [ $serverWasAlive -eq 1 ] || [ -f "${arkserverroot}/.startAfterUpdate" ]; then
rm -f "${arkserverroot}/.startAfterUpdate"
rm -f "${arkserverroot}/.ark-update.lock"
doStart --noautoupdate
fi
else