diff --git a/app/classes/shared/controller.py b/app/classes/shared/controller.py index d486e22a..65be08f2 100644 --- a/app/classes/shared/controller.py +++ b/app/classes/shared/controller.py @@ -212,7 +212,9 @@ class Controller: logger.error("Unable to create required server files due to :{}".format(e)) return False - server_command = 'java -Xms{}M -Xmx{}M -jar {} nogui'.format(float(min_mem) * 1000, float(max_mem) * 1000, full_jar_path) + server_command = 'java -Xms{}M -Xmx{}M -jar {} nogui'.format(helper.float_to_string(min_mem), + helper.float_to_string(max_mem), + full_jar_path) server_log_file = "{}/logs/latest.log".format(server_dir) server_stop = "stop" @@ -245,7 +247,9 @@ 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{}M -Xmx{}M -jar {} nogui'.format(float(min_mem) * 1000, float(max_mem) * 1000, full_jar_path) + server_command = 'java -Xms{}M -Xmx{}M -jar {} nogui'.format(helper.float_to_string(min_mem), + helper.float_to_string(max_mem), + full_jar_path) server_log_file = "{}/logs/latest.log".format(new_server_dir) server_stop = "stop" @@ -264,7 +268,9 @@ class Controller: return "false" full_jar_path = os.path.join(new_server_dir, server_jar) - server_command = 'java -Xms{}M -Xmx{}M -jar {} nogui'.format(float(min_mem) * 1000, float(max_mem) * 1000, full_jar_path) + server_command = 'java -Xms{}M -Xmx{}M -jar {} nogui'.format(helper.float_to_string(min_mem), + helper.float_to_string(max_mem), + full_jar_path) print('command: ' + server_command) server_log_file = "{}/logs/latest.log".format(new_server_dir) server_stop = "stop" diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py index 68ddec24..6fa08888 100644 --- a/app/classes/shared/helpers.py +++ b/app/classes/shared/helpers.py @@ -46,6 +46,10 @@ class Helpers: self.passhasher = PasswordHasher() self.exiting = False + def float_to_string(self, gbs: int): + s = str(float(gbs) * 1000).rstrip("0").rstrip(".") + return s + def check_file_perms(self, path): try: fp = open(path, "r").close()