From 962aef006fbf266c151d4dc6274c8a5c26f0c6af Mon Sep 17 00:00:00 2001
From: mathias <mail@mathias.is>
Date: Mon, 1 Oct 2018 00:09:50 +0300
Subject: [PATCH] Implement server hang checker

---
 bin/excludes | 30 ------------------------------
 bin/start    | 19 +++++++++++++++----
 2 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100644 bin/excludes

diff --git a/bin/excludes b/bin/excludes
deleted file mode 100644
index 87c8fa4..0000000
--- a/bin/excludes
+++ /dev/null
@@ -1,30 +0,0 @@
-plugins/bStats/
-plugins/Essentials/config.yml
-plugins/Essentials/items.csv
-plugins/Essentials/motd.txt
-plugins/Essentials/rules.txt
-plugins/Essentials/upgrades-done.yml
-plugins/Essentials/worth.yml
-plugins/FastAsyncWorldEdit/de/
-plugins/FastAsyncWorldEdit/es/
-plugins/FastAsyncWorldEdit/ru/
-plugins/FastAsyncWorldEdit/textures/
-plugins/FastAsyncWorldEdit/tr/
-plugins/FastAsyncWorldEdit/commands.yml
-plugins/FastAsyncWorldEdit/config.yml
-plugins/FastAsyncWorldEdit/extrablocks.json
-plugins/FastAsyncWorldEdit/message.yml
-plugins/ImageOnMap/i18n/
-plugins/ImageOnMap/config.yml
-plugins/LibsDisguises/Translations/
-plugins/LibsDisguises/config.yml
-plugins/LibsDisguises/disguises.yml
-plugins/MySkin/config.yml
-plugins/MySkin/localize.yml
-plugins/PluginMetrics/
-plugins/ProtocolLib/
-plugins/UltraCosmetics/config.yml
-plugins/UltraCosmetics/messages.yml
-plugins/Updater/
-plugins/WorldEdit/config.yml
-*.jar
diff --git a/bin/start b/bin/start
index 2be2dbb..f71ab06 100755
--- a/bin/start
+++ b/bin/start
@@ -4,6 +4,11 @@ echo "$PRIVATE_KEY" > .ssh/id_rsa
 chmod 400 $(find . ! -path "*/.*" -type f)
 chmod -R 500 crash-reports/ dumps/ plugins/bStats/ plugins/PluginMetrics/ plugins/ProtocolLib/ plugins/Updater/
 
+STARTSERVER=$(.bin/tmux new -d -s server 'while true; do
+    .bin/java/bin/java -Xmx400M -Xss512k -Xaggressive -Xdisablejavadump -Xnoagent -Xtune:virtualized -XX:MaxMetaspaceSize=100M -XX:MaxDirectMemorySize=50M -XX:-HeapDumpOnOutOfMemoryError -XX:+IdleTuningGcOnIdle -XX:+UseContainerSupport -D$
+    sleep 1
+done' &)
+
 #if [ "$(ssh -o StrictHostKeyChecking=no -T -c aes256-ctr -o Compression=no -x serv@kaboom.pw 'du -s sync/worlds/' | awk '{print $1}')" -gt "200000" ]; then
 #	ssh -o StrictHostKeyChecking=no serv@kaboom.pw 'cd sync/ && find . ! -path './plugins/WorldEdit/schematics' -type d -exec rm -rf {} +'
 #fi
@@ -28,9 +33,15 @@ while true; do
     sleep 1
 done &
 
-.bin/tmux new -d -s server 'while true; do
-    .bin/java/bin/java -Xmx400M -Xss512k -Xaggressive -Xdisablejavadump -Xnoagent -Xtune:virtualized -XX:MaxMetaspaceSize=100M -XX:MaxDirectMemorySize=50M -XX:-HeapDumpOnOutOfMemoryError -XX:+IdleTuningGcOnIdle -XX:+UseContainerSupport -Dcom.mojang.eula.agree=true -jar minecraft-server.jar --world-dir=worlds
-    sleep 1
-done' &
+eval $STARTSERVER
+sleep 60
+
+while true; do
+    if [ "echo -n -e '\xFE' | nc localhost 25565 | wc -m" -eq "0" ]; then
+        .bin/tmux kill-session -t server
+        eval $STARTSERVER
+    fi
+    sleep 10
+done &
 
 sleep infinity