From 4f7e1bfa24bd6c1328f57310fbf3219a6ee98772 Mon Sep 17 00:00:00 2001 From: luukas Date: Wed, 6 Jul 2022 19:00:17 +0300 Subject: [PATCH 1/5] Check for None when getting the CPU frequency data Default to -1 when an error occurs --- app/classes/minecraft/stats.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/classes/minecraft/stats.py b/app/classes/minecraft/stats.py index 64cbf894..ab75da51 100644 --- a/app/classes/minecraft/stats.py +++ b/app/classes/minecraft/stats.py @@ -87,7 +87,9 @@ class Stats: try: cpu_freq = psutil.cpu_freq() except NotImplementedError: - cpu_freq = psutil._common.scpufreq(current=0, min=0, max=0) + cpu_freq = None + if cpu_freq is None: + cpu_freq = psutil._common.scpufreq(current=-1, min=-1, max=-1) memory = psutil.virtual_memory() try: node_stats: NodeStatsDict = { From 6629bf2947772f27f900e57ce25d6e9a83b22f3a Mon Sep 17 00:00:00 2001 From: Zedifus Date: Mon, 18 Jul 2022 20:34:58 +0100 Subject: [PATCH 2/5] Correct release tracking in changelog --- CHANGELOG.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b4ffba8..05881069 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,20 @@ # Changelog -## --- [4.0.6] - 2022/07/06 +## --- [4.0.7] - 2022/07/18 ### New features -- Task toggle (!398+) -- Basic API for modifying tasks (!398+) +- Task toggle ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/398)) +- Basic API for modifying tasks ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/398)) +### Bug fixes +None +### Tweaks +None +### Lang +None + +[*Full Changelog*](../compare/v4.0.6...v4.0.7) +

+ +## --- [4.0.6] - 2022/07/06 ### Bug fixes - Remove redundant path check on backup restore ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/390)) - Fix issue with stats pinging on slow starting servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/391)) From 015351ed674bc7d91bf5e2fd0d9b5103e0c59b4f Mon Sep 17 00:00:00 2001 From: Zedifus Date: Mon, 18 Jul 2022 20:42:52 +0100 Subject: [PATCH 3/5] Backdate Commit view --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05881069..642fc76f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,8 @@ None - Check for passwords matching on client side ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/395)) ### Lang - Add string "cloneConfirm" to german translation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/389)) + +[*Full Changelog*](../compare/v4.0.5...v4.0.6)

## --- [4.0.5] - 2022/06/24 @@ -43,6 +45,8 @@ None - Add clone server confirmation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/384)) ### Lang - German translation review, fixed some spelling issues and added some missing strings ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/385)) + +[*Full Changelog*](../compare/v4.0.4...v4.0.5)

## --- [4.0.4-hotfix2] - 2022/06/21 @@ -70,6 +74,8 @@ None - - ([Merge Request 2](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/377)) - Rework server list on dashboard display for use on small screens ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/372)) - File handling enhancements ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/362)) + +[*Full Changelog*](../compare/v4.0.3...v4.0.4)

## --- [4.0.3] - 2022/06/18 @@ -80,6 +86,8 @@ None - API Token authentication hardening ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/364)) ### Tweaks - Add better error logging for statistic collection ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/359)) + +[*Full Changelog*](../compare/v4.0.2...v4.0.3)

## --- [4.0.2-hotfix1] - 2022/06/17 @@ -96,6 +104,8 @@ None - - ([Merge Request 2](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/351)) - Add version inheretence & config check ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/353)) - Fix support log temp file deletion issue/hang ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/354)) + +[*Full Changelog*](../compare/v4.0.1...v4.0.2)

## --- [4.0.1] - 2022/06/15 From 8db2c693c50cff91c8ce5720d947d1225e9067be Mon Sep 17 00:00:00 2001 From: Zedifus Date: Mon, 18 Jul 2022 20:47:30 +0100 Subject: [PATCH 4/5] Remove requirement for dev's to update CHANGELOG This will be handled on merge to dev. --- .gitlab/merge_request_templates/Default.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab/merge_request_templates/Default.md b/.gitlab/merge_request_templates/Default.md index 2acf3b1e..a82cb3f8 100644 --- a/.gitlab/merge_request_templates/Default.md +++ b/.gitlab/merge_request_templates/Default.md @@ -27,4 +27,3 @@ This checklist encourages us to confirm any changes have been analyzed to reduce * [ ] Have you resolved any lint issues? * [ ] Have you assigned a reviewer? * [ ] Have you applied correct labels? -* [ ] Have you updated CHANGELOG.md? From 514ef419f662e8f194b4213561523663b5a8d835 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Mon, 18 Jul 2022 20:55:50 +0100 Subject: [PATCH 5/5] Update changelog !397 Remove tag comparison, gitlab adds tag view hint when viewing changelog --- CHANGELOG.md | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 642fc76f..63839f17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,11 @@ - Task toggle ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/398)) - Basic API for modifying tasks ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/398)) ### Bug fixes -None +- Fixes stats recording for Oracle hosts ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/397)) ### Tweaks None ### Lang None - -[*Full Changelog*](../compare/v4.0.6...v4.0.7)

## --- [4.0.6] - 2022/07/06 @@ -28,8 +26,6 @@ None - Check for passwords matching on client side ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/395)) ### Lang - Add string "cloneConfirm" to german translation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/389)) - -[*Full Changelog*](../compare/v4.0.5...v4.0.6)

## --- [4.0.5] - 2022/06/24 @@ -45,8 +41,6 @@ None - Add clone server confirmation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/384)) ### Lang - German translation review, fixed some spelling issues and added some missing strings ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/385)) - -[*Full Changelog*](../compare/v4.0.4...v4.0.5)

## --- [4.0.4-hotfix2] - 2022/06/21 @@ -74,8 +68,6 @@ None - - ([Merge Request 2](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/377)) - Rework server list on dashboard display for use on small screens ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/372)) - File handling enhancements ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/362)) - -[*Full Changelog*](../compare/v4.0.3...v4.0.4)

## --- [4.0.3] - 2022/06/18 @@ -86,8 +78,6 @@ None - API Token authentication hardening ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/364)) ### Tweaks - Add better error logging for statistic collection ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/359)) - -[*Full Changelog*](../compare/v4.0.2...v4.0.3)

## --- [4.0.2-hotfix1] - 2022/06/17 @@ -104,8 +94,6 @@ None - - ([Merge Request 2](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/351)) - Add version inheretence & config check ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/353)) - Fix support log temp file deletion issue/hang ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/354)) - -[*Full Changelog*](../compare/v4.0.1...v4.0.2)

## --- [4.0.1] - 2022/06/15