Changeset 240 for scripts

Timestamp:

Jul 4, 2015, 3:37:27 PM (9 years ago)

Author:

alloc

Message:

Scripts 91

Location:

scripts/usr/local/lib/7dtd

Files:

• VERSION (modified) (1 diff)
• commands/start.sh (modified) (3 diffs)
• monitor-log.sh (modified) (1 diff)

scripts/usr/local/lib/7dtd/VERSION

@@ -1 @@
-Version: 89
-Release: 2015-07-03
-DediBuild: ???
+Version: 91
+Release: 2015-07-04
+DediBuild: 682942
 

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

@@ -36 +36 @@
                 done
 
-                LOG=$(getInstancePath $1)/logs/$(date '+%Y-%m-%d_%H-%M-%S')_output_log.txt
+                LOGTIMESTAMP=$(date '+%Y-%m-%d_%H-%M-%S')
+                LOG=$(getInstancePath $1)/logs/${LOGTIMESTAMP}_output_log.txt
                 SSD_PID="--pidfile $(getInstancePath $1)/7dtd.pid --make-pidfile"
                 SSD_DAEMON="--background --no-close"
@@ -42 +43 @@
                 OPTS="-logfile $LOG -configfile=$(getInstancePath $1)/config.xml"
                 
-                LC_ALL=C LD_LIBRARY_PATH=$SDTD_BASE/engine $SSD --start $SSD_PID $SSD_DAEMON $SSD_USER --chdir $SDTD_BASE/engine --exec $SDTD_BASE/engine/7DaysToDie.x86 -- $OPTS > $(getInstancePath $1)/logs/stdout.log 2>&1
+                LC_ALL=C LD_LIBRARY_PATH=$SDTD_BASE/engine $SSD --start $SSD_PID $SSD_DAEMON $SSD_USER --chdir $SDTD_BASE/engine --exec $SDTD_BASE/engine/7DaysToDieServer.x86 -- $OPTS > $(getInstancePath $1)/logs/stdout.log 2>&1
                 sleep 1
 
@@ -52 +53 @@
                         SSD_MONITOR_PID="--pidfile $(getInstancePath $1)/monitor.pid --make-pidfile"
                         SSD_MONITOR_DAEMON="--background"
-                        $SSD --start $SSD_MONITOR_PID $SSD_MONITOR_DAEMON --exec "/usr/local/lib/7dtd/monitor-log.sh" -- "$1" "$LOG"
+                        $SSD --start $SSD_MONITOR_PID $SSD_MONITOR_DAEMON --exec "/usr/local/lib/7dtd/monitor-log.sh" -- "$1" "$LOGTIMESTAMP"
                         echo "Done!"
                 else

scripts/usr/local/lib/7dtd/monitor-log.sh

@@ -10 +10 @@
 
 INSTANCE=$1
-LOG=$2
-#LOG=$(getInstancePath $INSTANCE)/logs/$(date '+%Y-%m-%d_%H-%M-%S')_output_log.txt
-CHATLOG=$(getInstancePath $INSTANCE)/logs/$(date '+%Y-%m-%d_%H-%M-%S')_chat.log
-COMMANDLOG=$(getInstancePath $INSTANCE)/logs/$(date '+%Y-%m-%d_%H-%M-%S')_commandExecution.log
+LOGTIMESTAMP=$2
+LOG=$(getInstancePath $INSTANCE)/logs/${LOGTIMESTAMP}_output_log.txt
+CHATLOG=$(getInstancePath $INSTANCE)/logs/${LOGTIMESTAMP}_chat.log
+COMMANDLOG=$(getInstancePath $INSTANCE)/logs/${LOGTIMESTAMP}_commandExecution.log
 
 timestamp() {