From 51a07a1f0d3aefd41436c10138dfb4ad779f6780 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 27 Jan 2022 22:29:18 -0500 Subject: [PATCH 1/2] Fix for server reporting updating when it's not --- app/classes/shared/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 74609fc5..2d930dee 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -562,7 +562,7 @@ class Server: update_thread.start() def check_update(self): - + if servers_helper.get_server_stats_by_id(self.server_id)['updating']: return True else: From d1db65dc9c30308206d5bef77bf9c4e8e72abb4a Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 28 Jan 2022 19:00:14 -0500 Subject: [PATCH 2/2] Fix typo when messages from players are written --- app/classes/shared/server.py | 6 +++++- app/classes/web/panel_handler.py | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 2d930dee..da19f485 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -46,6 +46,10 @@ class ServerOutBuf: ServerOutBuf.lines[self.server_id] = [] self.lsi = 0 + def clear_term(self): + self.line_buffer = '' + ServerOutBuf.lines[self.server_id] = [] + def process_byte(self, char): if char == os.linesep[self.lsi]: self.lsi += 1 @@ -76,7 +80,7 @@ class ServerOutBuf: break def new_line_handler(self, new_line): - new_line = re.sub('(\033\\[(0;)?[0-9]*[A-z]?(;[0-9])?m?)|(> )', '', new_line) + new_line = re.sub('(\033\\[(0;)?[0-9]*[A-z]?(;[0-9])?m?)', ' ', new_line) new_line = re.sub('[A-z]{2}\b\b', '', new_line) highlighted = helper.log_colors(html.escape(new_line)) diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index 3b4772b2..cf363101 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -17,6 +17,7 @@ from tornado.ioloop import IOLoop #TZLocal is set as a hidden import on win pipeline from tzlocal import get_localzone from cron_validator import CronValidator +from app.classes.controllers.servers_controller import Servers_Controller from app.classes.models.server_permissions import Enum_Permissions_Server from app.classes.models.crafty_permissions import Enum_Permissions_Crafty @@ -357,6 +358,9 @@ class PanelHandler(BaseHandler): if not superuser: self.redirect("/panel/error?error=Unauthorized access to Terminal") return + server_obj = Servers_Controller.get_server_obj(server_id) + if page_data['server_stats']['running']: + server_obj.clear_term() if subpage == 'logs': if not page_data['permissions']['Logs'] in page_data['user_permissions']: