NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-19 09:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/host-stats-error' into 'dev'

Browse Source 
Check for None when getting the CPU frequency data

See merge request crafty-controller/crafty-4!397
This commit is contained in:
Iain Powrie 2022-07-18 19:59:22 +00:00
commit 8694c5024a
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CHANGELOG.md
View File

@ -5,13 +5,11 @@
- Task toggle ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/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)) - Basic API for modifying tasks ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/398))
### Bug fixes ### Bug fixes
None - Fixes stats recording for Oracle hosts ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/397))
### Tweaks ### Tweaks
None None
### Lang ### Lang
None None
[*Full Changelog*](../compare/v4.0.6...v4.0.7)
<br><br> <br><br>
## --- [4.0.6] - 2022/07/06 ## --- [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)) - Check for passwords matching on client side ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/395))
### Lang ### Lang
- Add string "cloneConfirm" to german translation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/389)) - 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)
<br><br> <br><br>
## --- [4.0.5] - 2022/06/24 ## --- [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)) - Add clone server confirmation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/384))
### Lang ### 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)) - 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)
<br><br> <br><br>
## --- [4.0.4-hotfix2] - 2022/06/21 ## --- [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)) - - ([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)) - 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)) - File handling enhancements ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/362))
[*Full Changelog*](../compare/v4.0.3...v4.0.4)
<br><br> <br><br>
## --- [4.0.3] - 2022/06/18 ## --- [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)) - API Token authentication hardening ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/364))
### Tweaks ### Tweaks
- Add better error logging for statistic collection ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/359)) - 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)
<br><br> <br><br>
## --- [4.0.2-hotfix1] - 2022/06/17 ## --- [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)) - - ([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)) - 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)) - 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)
<br><br> <br><br>
## --- [4.0.1] - 2022/06/15 ## --- [4.0.1] - 2022/06/15

4
app/classes/minecraft/stats.py
View File

@ -87,7 +87,9 @@ class Stats:
try: try:
cpu_freq = psutil.cpu_freq() cpu_freq = psutil.cpu_freq()
except NotImplementedError: 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() memory = psutil.virtual_memory()
try: try:
node_stats: NodeStatsDict = { node_stats: NodeStatsDict = {