Changeset 46

Timestamp:

Jun 3, 2014, 8:01:56 PM (11 years ago)

Author:

alloc

Message:

Telnet command fix

Location:

scripts/usr/local/lib/7dtd

Files:

• commands/stop.sh (modified) (1 diff)
• common.sh (modified) (2 diffs)

scripts/usr/local/lib/7dtd/commands/stop.sh

@@ -32 +32 @@
 
                 echo "Trying to gracefully shutdown..."
-                tmp=$(telnetCommand $1 shutdown)
+                tmp=$(telnetCommand $1 shutdown "0.5")
                 echo "Waiting for server to shut down..."
         

scripts/usr/local/lib/7dtd/common.sh

@@ -151 +151 @@
 #   1: Instance name
 #   2: Command
+#   3: (Optional) Timeout in sec, defaulting to 1
 # Returns:
 #   String of telnet output
@@ -158 +159 @@
         local TEL_PASS=$(getConfigValue $1 TelnetPassword)      
         if [ "$TEL_ENABLED" = "true" ] && [ -n "$TEL_PASS" ]; then
-                echo -e "$TEL_PASS\n$2\nexit" | nc -q 2 127.0.0.1 $TEL_PORT
+                local TEMPFILE=$(mktemp)
+                rm -f $TEMPFILE
+                mkfifo $TEMPFILE
+                exec 3<> $TEMPFILE
+                nc 127.0.0.1 $TEL_PORT <&3 &
+                local NCPID=$!
+                printf "$TEL_PASS\n$2\n" >&3
+                sleep ${3:-1}
+                printf "exit\n" >&3
+                sleep 0.2
+                kill -9 $NCPID > /dev/null 2>&1
+                exec 3>&-
+                rm -f $TEMPFILE
         else
                 echo "Telnet not enabled or no password set."