From f265b070c09a262f4f3348dc87f2a499862fefe0 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Mon, 18 Jul 2022 14:55:12 -0400 Subject: [PATCH 1/2] Fix log file path issue for support log/log delete --- app/classes/controllers/servers_controller.py | 10 +++++++++- app/classes/shared/main_controller.py | 5 ++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/classes/controllers/servers_controller.py b/app/classes/controllers/servers_controller.py index ca59fbdc..d929aee0 100644 --- a/app/classes/controllers/servers_controller.py +++ b/app/classes/controllers/servers_controller.py @@ -2,6 +2,7 @@ import os import logging import time import json +import pathlib import typing as t from app.classes.controllers.roles_controller import RolesController @@ -538,7 +539,14 @@ class ServersController(metaclass=Singleton): continue log_files = list( - filter(lambda val: val != latest_log_file, os.listdir(logs_path)) + filter( + lambda val: val != latest_log_file, + os.listdir( + pathlib.Path( + server["path"], os.path.split(server["log_path"])[0] + ) + ), + ) ) for log_file in log_files: log_file_path = os.path.join(logs_path, log_file) diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py index 2c64f7cd..d8cd521d 100644 --- a/app/classes/shared/main_controller.py +++ b/app/classes/shared/main_controller.py @@ -159,7 +159,10 @@ class Controller: final_path += "_" + server["server_uuid"] os.mkdir(final_path) try: - FileHelpers.copy_file(server["log_path"], final_path) + FileHelpers.copy_file( + pathlib.Path(server["path"], server["log_path"]), + final_path, + ) except Exception as e: logger.warning(f"Failed to copy file with error: {e}") # Copy crafty logs to archive dir From dd0941bf71d7d5a049cb33088e5720d042c2e3f9 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Mon, 18 Jul 2022 22:08:15 +0100 Subject: [PATCH 2/2] Update changelog !406 Fix misc grammar/spelling in release entries --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0e75af5..2578e593 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,10 @@ - Toggle Visible servers on status page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/399)) ### Bug fixes - Fixes stats recording for Oracle hosts ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/397)) -- Improve the use of the object oriented architecture ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/400)) +- Improve use of object oriented architecture ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/400)) - Fix issue with API Server Instance is not serializable ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/401)) -- Fix an issue where the motd were not displayed properly one small screens ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/402)) +- Fix issue where the motd was not displayed properly on small screens ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/402)) +- Fix log file path issues caused by using relative paths ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/406)) ### Tweaks - Remove server.props requirement ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/403)) - Add platform & crafty version info to support logs ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/405))