Skip to content

Small fixes and improvements #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TrueOsiris merged 8 commits into from
May 13, 2024
Merged

Small fixes and improvements #52

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cfd1061
Fix log tail
Diyagi May 11, 2024
22aaa1d
Improved server exit
Diyagi May 11, 2024
c3b52e8
Add check for log file creation
Diyagi May 11, 2024
d0c05ae
Silence AVX check grep
Diyagi May 11, 2024
ef4a907
Fix env string checks to work with spaces
Diyagi May 11, 2024
d088ddb
Remove unnecessary timezone set
Diyagi May 11, 2024
c9ce4eb
Fix tail to not show old lines
Diyagi May 12, 2024
66d637a
Merge branch 'main' into fixes
TrueOsiris May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 32 additions & 9 deletions start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@
#!/bin/bash
s=/mnt/vrising/server
p=/mnt/vrising/persistentdata
echo "Setting timezone to $TZ"
echo $TZ > /etc/timezone 2>&1
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime 2>&1
dpkg-reconfigure -f noninteractive tzdata 2>&1

term_handler() {
echo "Shutting down Server"

PID=$(pgrep -f "^${s}/VRisingServer.exe")
kill -n 15 $PID
wait $PID
wineserver -k
sleep 1
exit
}

trap 'term_handler' SIGTERM

if [ ! -z $UID ]; then
usermod -u $UID docker 2>&1
fi
if [ ! -z $GID ]; then
groupmod -g $GID docker 2>&1
fi
if [ -z $SERVERNAME ]; then
if [ -z "$SERVERNAME" ]; then
SERVERNAME="trueosiris-V"
fi
if [ -z $WORLDNAME ]; then
if [ -z "$WORLDNAME" ]; then
WORLDNAME="world1"
fi
game_port=""
Expand All @@ -34,7 +44,7 @@ echo " "
echo "steam_appid: "`cat $s/steam_appid.txt`

echo " "
if ! grep -o 'avx[^ ]*' /proc/cpuinfo; then
if ! grep -q -o 'avx[^ ]*' /proc/cpuinfo; then
unsupported_file="VRisingServer_Data/Plugins/x86_64/lib_burst_generated.dll"
echo "AVX or AVX2 not supported; Check if unsupported ${unsupported_file} exists"
if [ -f "${s}/${unsupported_file}" ]; then
Expand All @@ -53,6 +63,14 @@ if [ ! -f "$p/Settings/ServerHostSettings.json" ]; then
echo "$p/Settings/ServerHostSettings.json not found. Copying default file."
cp "$s/VRisingServer_Data/StreamingAssets/Settings/ServerHostSettings.json" "$p/Settings/" 2>&1
fi

# Checks if log file exists, if not creates it
# Needed for fresh install
if ! [ -f "${p}/VRisingServer.log" ]; then
echo "Creating ${p}/VRisingServer.log"
touch $p/VRisingServer.log
fi

cd "$s"
echo "Starting V Rising Dedicated Server with name $SERVERNAME"
echo "Trying to remove /tmp/.X0-lock"
Expand All @@ -62,6 +80,11 @@ echo "Starting Xvfb"
Xvfb :0 -screen 0 1024x768x16 &
echo "Launching wine64 V Rising"
echo " "
DISPLAY=:0.0 wine64 /mnt/vrising/server/VRisingServer.exe -persistentDataPath $p -serverName "$SERVERNAME" -saveName "$WORLDNAME" -logFile "$p/VRisingServer.log" "$game_port" "$query_port" 2>&1
/usr/bin/tail -f /mnt/vrising/persistentdata/VRisingServer.log
DISPLAY=:0.0 wine64 /mnt/vrising/server/VRisingServer.exe -persistentDataPath $p -serverName "$SERVERNAME" -saveName "$WORLDNAME" -logFile "$p/VRisingServer.log" "$game_port" "$query_port" 2>&1 &

Comment on lines -66 to +85
Copy link
Copy Markdown

@dramikei dramikei May 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if its worth it, but can we have logs saved for last 3 runs?

like using VRisingServer-$(date +'%Y%m%d-%H%M').log (example: VRisingServer-20240513-2348.log)

We can maybe cleanup old logs when the script starts. This is helpful in case someone needs to go over old logs after starting a server.

Scenario:

  • User started server
  • Realized that the server didn't exit correctly / Crashed
  • Tries to figure out what happened by going over old logs.

Copy link
Copy Markdown
Contributor Author

@Diyagi Diyagi May 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i dont think VRisingServer.log is ever wiped, every time the server starts it seems that it just writes to the end of the file, that said, it would be better if each run had their logs split by files, i will see what i can come up with.

# Gets the PID of the last command
ServerPID=$!

# Tail log file and waits for Server PID to exit
/usr/bin/tail -n 0 -f $p/VRisingServer.log &
wait $ServerPID