From 9f11843c2691ae5164a89c9c53f999e6b4e28bfa Mon Sep 17 00:00:00 2001 From: = Date: Tue, 15 Apr 2025 18:02:15 -0400 Subject: [PATCH 1/4] Remove stats scheduling when server is offline --- app/classes/shared/server.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 8ebf4a3d..6fea7c50 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -925,7 +925,9 @@ class ServerInstance: try: # remove the stats polling job since server is stopped + logger.info("Cleaning up stats schedules for server %s", self.server_id) self.server_scheduler.remove_job("stats_" + str(self.server_id)) + self.server_scheduler.remove_job("save_stats_" + str(self.server_id)) except JobLookupError as e: logger.error( f"Could not remove job with id stats_{self.server_id} due" @@ -990,6 +992,7 @@ class ServerInstance: self.server_scheduler.remove_job(f"c_{self.server_id}") # remove the stats polling job since server is stopped self.server_scheduler.remove_job("stats_" + str(self.server_id)) + self.server_scheduler.remove_job("save_stats_" + str(self.server_id)) # the server crashed, or isn't found - so let's reset things. logger.warning( -- GitLab From b8b1895aa93714c6feefadc14d6fc0ea48581138 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 15 Apr 2025 18:07:56 -0400 Subject: [PATCH 2/4] Set "getting stats for server" to debug message --- app/classes/shared/server.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 6fea7c50..c3b45432 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -1660,13 +1660,11 @@ class ServerInstance: def get_servers_stats(self): server_stats = {} - logger.info("Getting Stats for Server " + self.name + " ...") + logger.debug("Getting Stats for Server %s | %s...", self.name, server_id) server_id = self.server_id server = HelperServers.get_server_data_by_id(server_id) - logger.debug(f"Getting stats for server: {server_id}") - # get our server object, settings and data dictionaries self.reload_server_settings() -- GitLab From 4f22e8b79262200a157c7de6a52b3244ef48a4e0 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 15 Apr 2025 18:10:54 -0400 Subject: [PATCH 3/4] Fix placement --- app/classes/shared/server.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index c3b45432..8ab0b317 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -1660,9 +1660,8 @@ class ServerInstance: def get_servers_stats(self): server_stats = {} - logger.debug("Getting Stats for Server %s | %s...", self.name, server_id) - server_id = self.server_id + logger.debug("Getting Stats for Server %s | %s...", self.name, server_id) server = HelperServers.get_server_data_by_id(server_id) # get our server object, settings and data dictionaries -- GitLab From 35e8b4258cae53c6b53b07da4b32195582a613aa Mon Sep 17 00:00:00 2001 From: Zedifus Date: Tue, 6 May 2025 04:23:03 +0100 Subject: [PATCH 4/4] Update changelog !842 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dea3d431..6272b2e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Fix overall player count on dashboard after CSS refactor ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/829)) - Fix ignored names being ignored on all unzips and not just server updates ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/830)) - Fix unzipping archive with db_stats would cause system crash ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/839)) +- Remove stats scheduling when monitored server is offline ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/842)) ### Tweaks - Add neoforge support in server builder ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/843)) ### Lang -- GitLab