Changeset 219 for scripts

Timestamp:

Dec 19, 2014, 6:51:16 PM (10 years ago)

Author:

alloc

Message:

scripts 71

Location:

scripts/usr/local/lib/7dtd

Files:

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

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

@@ -1 @@
-Version: 70
-Release: 2014-12-18
-DediBuild: 477715
+Version: 71
+Release: 2014-12-19
+DediBuild: 478721
 

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
                 SSD_PID="--pidfile $(getInstancePath $1)/7dtd.pid --make-pidfile"
                 SSD_DAEMON="--background --no-close"
                 SSD_USER="--chuid $SDTD_USER:$SDTD_GROUP --user $SDTD_USER"
-                OPTS="-logfile $(getInstancePath $1)/logs/output_log.txt -configfile=$(getInstancePath $1)/config.xml"
+                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
@@ -51 +52 @@
                         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"
+                        $SSD --start $SSD_MONITOR_PID $SSD_MONITOR_DAEMON --exec "/usr/local/lib/7dtd/monitor-log.sh" -- "$1" "$LOG"
                         echo "Done!"
                 else

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

@@ -10 +10 @@
 
 INSTANCE=$1
-LOG=$(getInstancePath $INSTANCE)/logs/$(date '+%Y-%m-%d_%H-%M-%S')_output.log
+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
@@ -85 +86 @@
 echo >> $LOG
 
-rm $(getInstancePath $INSTANCE)/logs/current_output.log
+rm $(getInstancePath $INSTANCE)/logs/current_output_log.txt
 rm $(getInstancePath $INSTANCE)/logs/current_chat.log
 rm $(getInstancePath $INSTANCE)/logs/current_commandExecution.log
-ln -s $LOG $(getInstancePath $INSTANCE)/logs/current_output.log
+ln -s $LOG $(getInstancePath $INSTANCE)/logs/current_output_log.txt
 ln -s $CHATLOG $(getInstancePath $INSTANCE)/logs/current_chat.log
 ln -s $COMMANDLOG $(getInstancePath $INSTANCE)/logs/current_commandExecution.log
@@ -96 +97 @@
 NOBUF="stdbuf -e0 -o0"
 
-$NOBUF tail -n 5000 -F $(getInstancePath $INSTANCE)/logs/output_log.txt |
+$NOBUF tail -n 5000 -F $(getInstancePath $INSTANCE)/logs/$LOG |
 $NOBUF tr '\\' '/' |
 $NOBUF tr -d '\r' |
 $NOBUF grep -v "^(Filename: " |
-$NOBUF sed -r 's/^[0-9]+-[0-9]+-[0-9]+T[0-9]+:[0-9]+:[0-9]+ [0-9]+[.,][0-9]+ (.*)$/\1/' |
+$NOBUF sed -r 's/^[0-9]+-[0-9]+-[0-9]+T[0-9]+:[0-9]+:[0-9]+ [0-9]+[.,][0-9]+ [A-Z]+ (.*)$/\1/' |
 while read line ; do
         if [ -n "$line" ]; then
-                echo "$(timestamp): $line" >> $LOG
                 #Player connected, clientid=[0-9]*, entityid=[0-9]*, name=.*, steamid=[0-9]*, ip=[0-9.]*$
                 if [ -n "$(echo "$line" | grep '^Player connected,')" ]; then