From 5a1353373a79aa0b9df50a0f962ec7fe10e39083 Mon Sep 17 00:00:00 2001 From: Silversthorn Date: Wed, 25 May 2022 15:54:35 +0200 Subject: [PATCH] trying something new --- app/classes/models/server_stats.py | 159 +++++++++++++---------------- app/classes/models/servers.py | 2 +- app/classes/shared/server.py | 38 +++---- 3 files changed, 91 insertions(+), 108 deletions(-) diff --git a/app/classes/models/server_stats.py b/app/classes/models/server_stats.py index 7e16f444..9d5eba39 100644 --- a/app/classes/models/server_stats.py +++ b/app/classes/models/server_stats.py @@ -66,11 +66,11 @@ class ServerStats(Model): # Servers_Stats Methods # ********************************************************************************** class HelperServerStats: - def __init__(self, database): + def __init__(self, database, server_id): self.database = database + self.server_id = server_id - @staticmethod - def init_database(server_id): + def init_database(self, server_id): try: server = HelperServers.get_server_data_by_id(server_id) db_folder = os.path.join(f"{server['path']}", "db_stats") @@ -102,10 +102,9 @@ class HelperServerStats: f"Error try to look for the db_stats files for server : {ex}" ) - @staticmethod - def select_database(server_id): + def select_database(self): try: - server = HelperServers.get_server_data_by_id(server_id) + server = HelperServers.get_server_data_by_id(self.server_id) db_file = os.path.join( f"{server['path']}", "db_stats", @@ -120,13 +119,12 @@ class HelperServerStats: f"Error try to look for the db_stats files for server : {ex}" ) - @staticmethod - def get_all_servers_stats(): + def get_all_servers_stats(self): servers = HelperServers.get_all_defined_servers() server_data = [] try: for s in servers: - HelperServerStats.select_database(s.get("server_id")) + # self.select_database(s.get("server_id")) latest = ( ServerStats.select() .where(ServerStats.server_id == s.get("server_id")) @@ -146,10 +144,9 @@ class HelperServerStats: ) return server_data - @staticmethod - def insert_server_stats(server): + def insert_server_stats(self, server): server_id = server.get("id", 0) - HelperServerStats.select_database(server_id) + # self.select_database(server_id) if server_id == 0: logger.warning("Stats saving failed with error: Server unknown (id = 0)") @@ -175,174 +172,158 @@ class HelperServerStats: } ).execute() - @staticmethod - def remove_old_stats(server_id, last_week): - HelperServerStats.select_database(server_id) + def remove_old_stats(self, last_week): + # self.select_database(self.server_id) ServerStats.delete().where(ServerStats.created < last_week).execute() - @staticmethod - def get_latest_server_stats(server_id): - HelperServerStats.select_database(server_id) + def get_latest_server_stats(self): + # self.select_database(self.server_id) return ( ServerStats.select() - .where(ServerStats.server_id == server_id) + .where(ServerStats.server_id == self.server_id) .order_by(ServerStats.created.desc()) .limit(1) ) - @staticmethod - def get_server_stats_by_id(server_id): - HelperServerStats.select_database(server_id) + def get_server_stats_by_id(self): + # self.select_database(self.server_id) stats = ( ServerStats.select() - .where(ServerStats.server_id == server_id) + .where(ServerStats.server_id == self.server_id) .order_by(ServerStats.created.desc()) .limit(1) ) return DatabaseShortcuts.return_rows(stats)[0] - @staticmethod - def server_id_exists(server_id): - HelperServerStats.select_database(server_id) - if not HelperServers.get_server_data_by_id(server_id): + def server_id_exists(self): + # self.select_database(self.server_id) + if not HelperServers.get_server_data_by_id(self.server_id): return False return True - @staticmethod - def sever_crashed(server_id): - HelperServerStats.select_database(server_id) + def sever_crashed(self): + # self.select_database(self.server_id) ServerStats.update(crashed=True).where( - ServerStats.server_id == server_id + ServerStats.server_id == self.server_id ).execute() - @staticmethod - def set_download(server_id): - HelperServerStats.select_database(server_id) + def set_download(self): + # self.select_database(self.server_id) ServerStats.update(downloading=True).where( - ServerStats.server_id == server_id + ServerStats.server_id == self.server_id ).execute() - @staticmethod - def finish_download(server_id): - HelperServerStats.select_database(server_id) + def finish_download(self): + # self.select_database(self.server_id) ServerStats.update(downloading=False).where( - ServerStats.server_id == server_id + ServerStats.server_id == self.server_id ).execute() - @staticmethod - def get_download_status(server_id): - HelperServerStats.select_database(server_id) + def get_download_status(self): + # self.select_database(self.server_id) download_status = ( - ServerStats.select().where(ServerStats.server_id == server_id).get() + ServerStats.select().where(ServerStats.server_id == self.server_id).get() ) return download_status.downloading - @staticmethod - def server_crash_reset(server_id): - if server_id is None: + def server_crash_reset(self): + if self.server_id is None: return - HelperServerStats.select_database(server_id) + # self.select_database(self.server_id) ServerStats.update(crashed=False).where( - ServerStats.server_id == server_id + ServerStats.server_id == self.server_id ).execute() - @staticmethod - def is_crashed(server_id): - HelperServerStats.select_database(server_id) - svr = ServerStats.select().where(ServerStats.server_id == server_id).get() + def is_crashed(self): + # self.select_database(self.server_id) + svr = ServerStats.select().where(ServerStats.server_id == self.server_id).get() # pylint: disable=singleton-comparison if svr.crashed == True: return True else: return False - @staticmethod - def set_update(server_id, value): - if server_id is None: + def set_update(self, value): + if self.server_id is None: return - HelperServerStats.select_database(server_id) + # self.select_database(self.server_id) try: # Checks if server even exists - ServerStats.select().where(ServerStats.server_id == server_id) + ServerStats.select().where(ServerStats.server_id == self.server_id) except Exception as ex: logger.error(f"Database entry not found! {ex}") ServerStats.update(updating=value).where( - ServerStats.server_id == server_id + ServerStats.server_id == self.server_id ).execute() - @staticmethod - def get_update_status(server_id): - HelperServerStats.select_database(server_id) + def get_update_status(self): + # self.select_database(self.server_id) update_status = ( - ServerStats.select().where(ServerStats.server_id == server_id).get() + ServerStats.select().where(ServerStats.server_id == self.server_id).get() ) return update_status.updating - @staticmethod - def set_first_run(server_id): - HelperServerStats.select_database(server_id) + def set_first_run(self): + # self.select_database(self.server_id) # Sets first run to false try: # Checks if server even exists - ServerStats.select().where(ServerStats.server_id == server_id) + ServerStats.select().where(ServerStats.server_id == self.server_id) except Exception as ex: logger.error(f"Database entry not found! {ex}") return ServerStats.update(first_run=False).where( - ServerStats.server_id == server_id + ServerStats.server_id == self.server_id ).execute() - @staticmethod - def get_first_run(server_id): - HelperServerStats.select_database(server_id) - first_run = ServerStats.select().where(ServerStats.server_id == server_id).get() + def get_first_run(self): + # self.select_database(self.server_id) + first_run = ( + ServerStats.select().where(ServerStats.server_id == self.server_id).get() + ) return first_run.first_run - @staticmethod - def get_ttl_without_player(server_id): - HelperServerStats.select_database(server_id) + def get_ttl_without_player(self): + # self.select_database(self.server_id) last_stat = ( ServerStats.select() - .where(ServerStats.server_id == server_id) + .where(ServerStats.server_id == self.server_id) .order_by(ServerStats.created.desc()) .first() ) last_stat_with_player = ( ServerStats.select() - .where(ServerStats.server_id == server_id) + .where(ServerStats.server_id == self.server_id) .where(ServerStats.online > 0) .order_by(ServerStats.created.desc()) .first() ) return last_stat.created - last_stat_with_player.created - @staticmethod - def can_stop_no_players(server_id, time_limit): - HelperServerStats.select_database(server_id) + def can_stop_no_players(self, time_limit): + # self.select_database(self.server_id) can = False - ttl_no_players = HelperServerStats.get_ttl_without_player(server_id) + ttl_no_players = self.get_ttl_without_player() if (time_limit == -1) or (ttl_no_players > time_limit): can = True return can - @staticmethod - def set_waiting_start(server_id, value): - HelperServerStats.select_database(server_id) + def set_waiting_start(self, value): + # self.select_database(self.server_id) try: # Checks if server even exists - ServerStats.select().where(ServerStats.server_id == server_id) + ServerStats.select().where(ServerStats.server_id == self.server_id) except Exception as ex: logger.error(f"Database entry not found! {ex}") ServerStats.update(waiting_start=value).where( - ServerStats.server_id == server_id + ServerStats.server_id == self.server_id ).execute() - @staticmethod - def get_waiting_start(server_id): - HelperServerStats.select_database(server_id) + def get_waiting_start(self): + # self.select_database(self.server_id) waiting_start = ( - ServerStats.select().where(ServerStats.server_id == server_id).get() + ServerStats.select().where(ServerStats.server_id == self.server_id).get() ) return waiting_start.waiting_start diff --git a/app/classes/models/servers.py b/app/classes/models/servers.py index c2c449d7..e4dd4316 100644 --- a/app/classes/models/servers.py +++ b/app/classes/models/servers.py @@ -16,7 +16,7 @@ from app.classes.models.base_model import BaseModel logger = logging.getLogger(__name__) # ********************************************************************************** -# Servers Class +# Servers Model # ********************************************************************************** class Servers(BaseModel): server_id = AutoField() diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 7d85ad59..0992f4a1 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -111,6 +111,8 @@ class Server: self.is_crashed = False self.restart_count = 0 self.stats = stats + self.server_object = HelperServers.get_server_obj(self.server_id) + self.stats_helper = HelperServerStats(self.server_id) tz = get_localzone() self.server_scheduler = BackgroundScheduler(timezone=str(tz)) self.server_scheduler.start() @@ -119,8 +121,8 @@ class Server: ) self.is_backingup = False # Reset crash and update at initialization - HelperServerStats.server_crash_reset(self.server_id) - HelperServerStats.set_update(self.server_id, False) + self.stats_helper.server_crash_reset(self.server_id) + self.stats_helper.set_update(self.server_id, False) # ********************************************************************************** # Minecraft Server Management @@ -143,7 +145,7 @@ class Server: self.name = server_name self.settings = server_data_obj - HelperServerStats.init_database(server_id) + self.stats_helper.init_database(server_id) self.record_server_stats() # build our server run command @@ -165,7 +167,7 @@ class Server: Console.info(f"Starting server ID: {self.server_id} - {self.name}") logger.info(f"Starting server ID: {self.server_id} - {self.name}") # Sets waiting start to false since we're attempting to start the server. - HelperServerStats.set_waiting_start(self.server_id, False) + self.stats_helper.set_waiting_start(self.server_id, False) self.run_threaded_server(None) # remove the scheduled job since it's ran @@ -232,7 +234,7 @@ class Server: else: user_lang = HelperUsers.get_user_lang_by_id(user_id) - if HelperServerStats.get_download_status(self.server_id): + if self.stats_helper.get_download_status(self.server_id): if user_id: self.helper.websocket_helper.broadcast_user( user_id, @@ -405,7 +407,7 @@ class Server: ).start() self.is_crashed = False - HelperServerStats.server_crash_reset(self.server_id) + self.stats_helper.server_crash_reset(self.server_id) self.start_time = str(datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")) @@ -413,7 +415,7 @@ class Server: logger.info(f"Server {self.name} running with PID {self.process.pid}") Console.info(f"Server {self.name} running with PID {self.process.pid}") self.is_crashed = False - HelperServerStats.server_crash_reset(self.server_id) + self.stats_helper.server_crash_reset(self.server_id) self.record_server_stats() check_internet_thread = threading.Thread( target=self.check_internet_thread, @@ -426,9 +428,9 @@ class Server: ) check_internet_thread.start() # Checks if this is the servers first run. - if HelperServerStats.get_first_run(self.server_id): - HelperServerStats.set_first_run(self.server_id) - loc_server_port = HelperServerStats.get_server_stats_by_id( + if self.stats_helper.get_first_run(self.server_id): + self.stats_helper.set_first_run(self.server_id) + loc_server_port = self.stats_helper.get_server_stats_by_id( self.server_id )["server_port"] # Sends port reminder message. @@ -710,7 +712,7 @@ class Server: self.server_scheduler.remove_job("c_" + str(self.server_id)) return - HelperServerStats.sever_crashed(self.server_id) + self.stats_helper.sever_crashed(self.server_id) # if we haven't tried to restart more 3 or more times if self.restart_count <= 3: @@ -734,7 +736,7 @@ class Server: self.restart_count = 0 self.is_crashed = True - HelperServerStats.sever_crashed(self.server_id) + self.stats_helper.sever_crashed(self.server_id) # cancel the watcher task self.server_scheduler.remove_job("c_" + str(self.server_id)) @@ -964,7 +966,7 @@ class Server: return [] def jar_update(self): - HelperServerStats.set_update(self.server_id, True) + self.stats_helper.set_update(self.server_id, True) update_thread = threading.Thread( target=self.a_jar_update, daemon=True, name=f"exe_update_{self.name}" ) @@ -972,7 +974,7 @@ class Server: def check_update(self): - if HelperServerStats.get_server_stats_by_id(self.server_id)["updating"]: + if self.stats_helper.get_server_stats_by_id(self.server_id)["updating"]: return True else: return False @@ -1045,11 +1047,11 @@ class Server: self.settings["executable_update_url"], current_executable ) - while HelperServerStats.get_server_stats_by_id(self.server_id)["updating"]: + while self.stats_helper.get_server_stats_by_id(self.server_id)["updating"]: if downloaded and not self.is_backingup: logger.info("Executable updated successfully. Starting Server") - HelperServerStats.set_update(self.server_id, False) + self.stats_helper.set_update(self.server_id, False) if len(self.helper.websocket_helper.clients) > 0: # There are clients self.check_update() @@ -1445,11 +1447,11 @@ class Server: def record_server_stats(self): server = self.get_servers_stats() - HelperServerStats.insert_server_stats(server) + self.stats_helper.insert_server_stats(server) # delete old data max_age = self.helper.get_setting("history_max_age") now = datetime.datetime.now() last_week = now.day - max_age - HelperServerStats.remove_old_stats(server.get("id", 0), last_week) + self.stats_helper.remove_old_stats(server.get("id", 0), last_week)