From 9e66f46c2eadee9f141f26a3ef31ebdbb59d7329 Mon Sep 17 00:00:00 2001 From: LukasDoesDev Date: Wed, 13 Jan 2021 16:48:04 +0200 Subject: [PATCH] 2 bug fixes 1st: Footer had padding in credits.html, caused by missing closing div tag. 2nd: Java VM errors when memory is a float. Server wizard should convert from gigabytes to megabytes (Trello card) --- app/classes/shared/controller.py | 7 ++++--- app/frontend/templates/panel/credits.html | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/classes/shared/controller.py b/app/classes/shared/controller.py index 20a01337..7c5bf2a8 100644 --- a/app/classes/shared/controller.py +++ b/app/classes/shared/controller.py @@ -212,7 +212,7 @@ class Controller: logger.error("Unable to create required server files due to :{}".format(e)) return False - server_command = 'java -Xms{}G -Xmx{}G -jar {} nogui'.format(min_mem, max_mem, full_jar_path) + server_command = 'java -Xms{}M -Xmx{}M -jar {} nogui'.format(float(min_mem) * 1000, float(max_mem) * 1000, full_jar_path) server_log_file = "{}/logs/latest.log".format(server_dir) server_stop = "stop" @@ -245,7 +245,7 @@ class Controller: dir_util.copy_tree(server_path, new_server_dir) full_jar_path = os.path.join(new_server_dir, server_jar) - server_command = 'java -Xms{}G -Xmx{}G -jar {} nogui'.format(min_mem, max_mem, full_jar_path) + server_command = 'java -Xms{}M -Xmx{}M -jar {} nogui'.format(float(min_mem) * 1000, float(max_mem) * 1000, full_jar_path) server_log_file = "{}/logs/latest.log".format(new_server_dir) server_stop = "stop" @@ -264,7 +264,8 @@ class Controller: return "false" full_jar_path = os.path.join(new_server_dir, server_jar) - server_command = 'java -Xms{}G -Xmx{}G -jar {} nogui'.format(min_mem, max_mem, full_jar_path) + server_command = 'java -Xms{}M -Xmx{}M -jar {} nogui'.format(float(min_mem) * 1000, float(max_mem) * 1000, full_jar_path) + print('command: ' + server_command) server_log_file = "{}/logs/latest.log".format(new_server_dir) server_stop = "stop" diff --git a/app/frontend/templates/panel/credits.html b/app/frontend/templates/panel/credits.html index c72e7029..cc82155f 100644 --- a/app/frontend/templates/panel/credits.html +++ b/app/frontend/templates/panel/credits.html @@ -512,6 +512,7 @@ +