From 10bd7a74c9cabc39f284a37ad163a5ec05484aa1 Mon Sep 17 00:00:00 2001
From: Phillip Tarrant <ptarrant@gmail.com>
Date: Wed, 7 Oct 2020 09:19:47 -0400
Subject: [PATCH] fixed issue where server settings don't get reloaded when
 changing server config without restarting crafty. Now server settings get
 repulled from DB after writing new settings on config change

---
 app/classes/shared/controller.py | 4 ++++
 app/classes/shared/server.py     | 6 +++++-
 app/classes/web/panel_handler.py | 2 ++
 app/config/serverjars.json       | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/classes/shared/controller.py b/app/classes/shared/controller.py
index 4712cbed..805abe5d 100644
--- a/app/classes/shared/controller.py
+++ b/app/classes/shared/controller.py
@@ -87,6 +87,10 @@ class Controller:
                 s['auto_start_delay']
             ))
 
+    def refresh_server_settings(self, server_id: int):
+        server_obj = self.get_server_obj(server_id)
+        server_obj.reload_server_settings()
+
     def get_server_obj(self, server_id):
 
         for s in self.servers_list:
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 58e5a041..a52cb73a 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -13,7 +13,7 @@ import logging.config
 
 from app.classes.shared.helpers import helper
 from app.classes.shared.console import console
-
+from app.classes.shared.models import db_helper, Servers
 
 logger = logging.getLogger(__name__)
 
@@ -45,6 +45,10 @@ class Server:
         self.is_crashed = False
         self.restart_count = 0
 
+    def reload_server_settings(self):
+        server_data = db_helper.get_server_data_by_id(self.server_id)
+        self.settings = server_data
+
     def do_server_setup(self, server_data_obj):
         logger.info('Creating Server object: {} | Server Name: {} | Auto Start: {}'.format(
                                                                 server_data_obj['server_id'],
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 7bd323bd..d14d6bcc 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -161,6 +161,8 @@ class PanelHandler(BaseHandler):
                 Servers.crash_detection: crash_detection,
             }).where(Servers.server_id == server_id).execute()
 
+            controller.refresh_server_settings(server_id)
+
             user_data = json.loads(self.get_secure_cookie("user_data"))
 
             db_helper.add_to_audit_log(user_data['user_id'],
diff --git a/app/config/serverjars.json b/app/config/serverjars.json
index 736bef8a..f8f4d04f 100644
--- a/app/config/serverjars.json
+++ b/app/config/serverjars.json
@@ -1,5 +1,5 @@
 {
-    "last_refreshed": "09/21/2020, 21:59:31",
+    "last_refreshed": "10/07/2020, 09:09:10",
     "servers": {
         "nukkitx": [
             "1.14"