From 478dfdc6efc82d51ab69fcf95e713b9741661224 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sat, 18 Jun 2022 17:18:21 -0400 Subject: [PATCH] Fix -1 showing on dashboard when offline --- app/classes/minecraft/stats.py | 23 +++++++++++++---------- app/classes/shared/server.py | 4 ++-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/classes/minecraft/stats.py b/app/classes/minecraft/stats.py index e2fdfe8f..4b699717 100644 --- a/app/classes/minecraft/stats.py +++ b/app/classes/minecraft/stats.py @@ -130,16 +130,19 @@ class Stats: } @staticmethod - def _try_get_process_stats(process): - try: - return Stats._get_process_stats(process) - except Exception as e: - logger.debug( - f"getting process stats for pid {process.pid} " - "failed due to the following error:", - exc_info=e, - ) - return {"cpu_usage": -1, "memory_usage": -1, "mem_percentage": -1} + def _try_get_process_stats(process, running): + if running: + try: + return Stats._get_process_stats(process) + except Exception as e: + logger.debug( + f"getting process stats for pid {process.pid} " + "failed due to the following error:", + exc_info=e, + ) + return {"cpu_usage": -1, "memory_usage": -1, "mem_percentage": -1} + else: + return {"cpu_usage": 0, "memory_usage": 0, "mem_percentage": 0} @staticmethod def _get_process_stats(process): diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index cdd5f796..50169647 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -1250,7 +1250,7 @@ class ServerInstance: server_path = server["path"] # process stats - p_stats = Stats._try_get_process_stats(self.process) + p_stats = Stats._try_get_process_stats(self.process, self.check_running()) # TODO: search server properties file for possible override of 127.0.0.1 internal_ip = server["server_ip"] @@ -1383,7 +1383,7 @@ class ServerInstance: server_path = server_dt["path"] # process stats - p_stats = Stats._try_get_process_stats(self.process) + p_stats = Stats._try_get_process_stats(self.process, self.check_running()) # TODO: search server properties file for possible override of 127.0.0.1 # internal_ip = server['server_ip']