Changeset 14 for scripts/usr/local/bin/7dtd-kill.sh

Timestamp:

May 17, 2014, 6:01:31 PM (11 years ago)

Author:

alloc

Message:

More instance validation, switch to XMLStarlet, config.xml instead of serverconfig.xml, admins.xml instead of serveradmin.xml

File:

• scripts/usr/local/bin/7dtd-kill.sh (modified) (2 diffs)

scripts/usr/local/bin/7dtd-kill.sh

@@ -1 +1 @@
 #!/bin/bash
-# Version 1
+# Version 3
 
 # Tries to stop the 7dtd instance given as first parameter.
@@ -12 +12 @@
 checkRootLoadConf
 
-checkInstance $1
+checkInstanceValid $1
 
 res=$(isRunning $1)
 if [ $res -eq 1 ]; then
-        telnetCommand $1 shutdown
-        sleep 1
-        res=$(isRunning $1)
-        if [ $res -eq 1 ]; then
+        echo "Trying to gracefully shutdown..."
+        tmp=$(telnetCommand $1 shutdown)
+        echo "Waiting for server to shut down..."
+        
+        waittime=0
+        maxwait=5
+        until [ $(isRunning $1) -eq 0 ] || [ $waittime -eq $maxwait ]; do
+                (( waittime++ ))
+                sleep 1
+                echo $waittime/$maxwait
+        done
+        
+        if [ $(isRunning $1) -eq 1 ]; then
+                echo "Failed, force closing server..."
                 start-stop-daemon --stop --pidfile $(getInstancePath $1)/7dtd.pid
         fi