AriasCreations/ConanServerManager
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Only shut down automatically when automatic shutdown is enabled by settings

Browse source
This commit is contained in:
zontreck 2024-05-24 17:57:14 -07:00
parent 878d1ea330
commit 8d9d792568
5 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker_images/installer/Dockerfile
View file

@ -1,4 +1,4 @@
FROM git.zontreck.com/ariascreations/conanservermanager:latest FROM git.zontreck.com/ariascreations/conanservermanager:stable
RUN echo "Welcome to the Server Installer" RUN echo "Welcome to the Server Installer"

3
docker_images/installer/install.sh
View file

@ -1,9 +1,8 @@
#!/bin/bash #!/bin/bash
cp /app/server /mnt/server/server
pushd /mnt/server pushd /mnt/server
./server /app/server
popd popd
echo "Initial Install completed" echo "Initial Install completed"

9
docker_images/latest/Dockerfile
View file

@ -7,4 +7,13 @@ FROM git.zontreck.com/ariascreations/conanservermanager:stable
COPY ./entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh
EXPOSE 25306/tcp
EXPOSE 7777/tcp
EXPOSE 7777/udp
EXPOSE 7778/udp
EXPOSE 7779/tcp
EXPOSE 7779/udp
EXPOSE 7780/tcp
EXPOSE 7780/udp
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]

1
docker_images/latest/entrypoint.sh
View file

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
# Copied the entrypoint and slightly altered, from parkervcp's dart yolk. # Copied the entrypoint and slightly altered, from parkervcp's dart yolk.
cd /home/container cd /home/container
# Print Dart version # Print Dart version

5
lib/statemachine.dart
View file

@ -220,7 +220,7 @@ class StateMachine {
} }
} }
if (send) { if (send && settings.inst!.timer.enabled) {
// Send the alert message // Send the alert message
SessionData.CURRENT_INTERVAL = current; SessionData.CURRENT_INTERVAL = current;
if (current.type == WarnType.Intrusive) { if (current.type == WarnType.Intrusive) {
@ -236,7 +236,8 @@ class StateMachine {
} }
// Check Total Seconds // Check Total Seconds
if (SessionData.timer.getTotalSeconds() == 0) { if (SessionData.timer.getTotalSeconds() == 0 &&
settings.inst!.timer.enabled) {
SessionData.shutdownPending = true; SessionData.shutdownPending = true;
} }