From ccfbad91d1af2a500b3666a703b57f0cc55d8957 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Sun, 19 Jun 2022 23:07:48 -0400 Subject: [PATCH 1/2] Check if ping result is boolean --- app/classes/minecraft/stats.py | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/app/classes/minecraft/stats.py b/app/classes/minecraft/stats.py index 4b699717..c0261198 100644 --- a/app/classes/minecraft/stats.py +++ b/app/classes/minecraft/stats.py @@ -265,15 +265,24 @@ class Stats: logger.info( "Unable to read the server icon due to the following error:", exc_info=e ) - - ping_data = { - "online": online_stats.get("online", 0), - "max": online_stats.get("max", 0), - "players": online_stats.get("players", 0), - "server_description": ping_obj.description, - "server_version": ping_obj.version, - "server_icon": server_icon, - } + if ping_obj: + ping_data = { + "online": online_stats.get("online", 0), + "max": online_stats.get("max", 0), + "players": online_stats.get("players", 0), + "server_description": ping_obj.description, + "server_version": ping_obj.version, + "server_icon": server_icon, + } + else: + ping_data = { + "online": online_stats.get("online", 0), + "max": online_stats.get("max", 0), + "players": online_stats.get("players", 0), + "server_description": "", + "server_version": "", + "server_icon": server_icon, + } return ping_data -- GitLab From 8518cbbcd9c6e2bc3d8ac0e5c72065b65a06fcc3 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Tue, 21 Jun 2022 04:18:24 +0100 Subject: [PATCH 2/2] Update CHANGELOG.md !371 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6f380ac..b2733555 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Add shutdown on backup feature ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/373)) ### Bug fixes - Backup/Config.json rework for API key hardening ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/369)) +- Fix stack on ping result being falsy ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/371)) ### Tweaks - Spelling mistake fixed in German lang file ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/370)) - Backup failure warning (Tab text goes red) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/373)) -- GitLab