Changeset 240


Ignore:
Timestamp:
Jul 4, 2015, 3:37:27 PM (9 years ago)
Author:
alloc
Message:

Scripts 91

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • binary-improvements/server-fixes.userprefs

    r238 r240  
    11<Properties>
    22  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release_Version" />
    3   <MonoDevelop.Ide.Workbench ActiveDocument="7dtd-server-fixes/src/ChatHookExample.cs">
     3  <MonoDevelop.Ide.Workbench ActiveDocument="MapRendering/Web/ApiHandler.cs">
    44    <Files>
    5       <File FileName="MapRendering/MapRendering/MapRenderBlockBuffer.cs" Line="66" Column="53" />
    6       <File FileName="MapRendering/MapRendering/MapRendering.cs" Line="343" Column="42" />
    75      <File FileName="MapRendering/MapRendering/Constants.cs" Line="1" Column="1" />
    8       <File FileName="MapRendering/Web/API/GetPlayersOnline.cs" Line="32" Column="80" />
    9       <File FileName="7dtd-server-fixes/src/PersistentData/Player.cs" Line="140" Column="1" />
    10       <File FileName="MapRendering/Web/API/GetPlayersLocation.cs" Line="18" Column="40" />
    11       <File FileName="7dtd-server-fixes/src/PersistentData/Players.cs" Line="13" Column="19" />
     6      <File FileName="7dtd-server-fixes/src/PersistentData/Player.cs" Line="130" Column="40" />
    127      <File FileName="7dtd-server-fixes/src/AssemblyInfo.cs" Line="20" Column="35" />
    138      <File FileName="7dtd-server-fixes/ModInfo.xml" Line="7" Column="20" />
     
    1510      <File FileName="MapRendering/ModInfo.xml" Line="7" Column="20" />
    1611      <File FileName="MapRendering/Web/ApiHandler.cs" Line="31" Column="3" />
    17       <File FileName="MapRendering/Web/Web.cs" Line="59" Column="19" />
    18       <File FileName="MapRendering/Web/ItemIconHandler.cs" Line="27" Column="53" />
    19       <File FileName="7dtd-server-fixes/src/ChatHookExample.cs" Line="17" Column="53" />
    20       <File FileName="7dtd-server-fixes/src/API.cs" Line="31" Column="28" />
     12      <File FileName="7dtd-server-fixes/src/API.cs" Line="12" Column="29" />
    2113    </Files>
    2214    <Pads>
  • scripts/usr/local/lib/7dtd/VERSION

    r239 r240  
    1 Version: 89
    2 Release: 2015-07-03
    3 DediBuild: ???
     1Version: 91
     2Release: 2015-07-04
     3DediBuild: 682942
    44
  • scripts/usr/local/lib/7dtd/commands/start.sh

    r219 r240  
    3636                done
    3737
    38                 LOG=$(getInstancePath $1)/logs/$(date '+%Y-%m-%d_%H-%M-%S')_output_log.txt
     38                LOGTIMESTAMP=$(date '+%Y-%m-%d_%H-%M-%S')
     39                LOG=$(getInstancePath $1)/logs/${LOGTIMESTAMP}_output_log.txt
    3940                SSD_PID="--pidfile $(getInstancePath $1)/7dtd.pid --make-pidfile"
    4041                SSD_DAEMON="--background --no-close"
     
    4243                OPTS="-logfile $LOG -configfile=$(getInstancePath $1)/config.xml"
    4344               
    44                 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
     45                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
    4546                sleep 1
    4647
     
    5253                        SSD_MONITOR_PID="--pidfile $(getInstancePath $1)/monitor.pid --make-pidfile"
    5354                        SSD_MONITOR_DAEMON="--background"
    54                         $SSD --start $SSD_MONITOR_PID $SSD_MONITOR_DAEMON --exec "/usr/local/lib/7dtd/monitor-log.sh" -- "$1" "$LOG"
     55                        $SSD --start $SSD_MONITOR_PID $SSD_MONITOR_DAEMON --exec "/usr/local/lib/7dtd/monitor-log.sh" -- "$1" "$LOGTIMESTAMP"
    5556                        echo "Done!"
    5657                else
  • scripts/usr/local/lib/7dtd/monitor-log.sh

    r234 r240  
    1010
    1111INSTANCE=$1
    12 LOG=$2
    13 #LOG=$(getInstancePath $INSTANCE)/logs/$(date '+%Y-%m-%d_%H-%M-%S')_output_log.txt
    14 CHATLOG=$(getInstancePath $INSTANCE)/logs/$(date '+%Y-%m-%d_%H-%M-%S')_chat.log
    15 COMMANDLOG=$(getInstancePath $INSTANCE)/logs/$(date '+%Y-%m-%d_%H-%M-%S')_commandExecution.log
     12LOGTIMESTAMP=$2
     13LOG=$(getInstancePath $INSTANCE)/logs/${LOGTIMESTAMP}_output_log.txt
     14CHATLOG=$(getInstancePath $INSTANCE)/logs/${LOGTIMESTAMP}_chat.log
     15COMMANDLOG=$(getInstancePath $INSTANCE)/logs/${LOGTIMESTAMP}_commandExecution.log
    1616
    1717timestamp() {
Note: See TracChangeset for help on using the changeset viewer.