From 39190ed43be06d2e495d6c47c374664661b66b31 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Thu, 2 Mar 2023 13:40:45 -0500 Subject: [PATCH] Default to not delete logs --- app/classes/shared/helpers.py | 2 +- app/classes/shared/tasks.py | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py index 96b3fac8..cf108bcd 100644 --- a/app/classes/shared/helpers.py +++ b/app/classes/shared/helpers.py @@ -441,7 +441,7 @@ class Helpers: "reset_secrets_on_next_boot": False, "monitored_mounts": mounts, "dir_size_poll_freq_minutes": 5, - "crafty_logs_delete_after_days": 14, + "crafty_logs_delete_after_days": 0, } def get_all_settings(self): diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py index 9c1f52b0..8f51842b 100644 --- a/app/classes/shared/tasks.py +++ b/app/classes/shared/tasks.py @@ -774,16 +774,19 @@ class TasksManager: "session.log", "commander.log", ] - - log_files = list( - filter( - lambda val: val not in latest_log_files, - os.listdir(logs_path), + # we won't delete if delete logs after is set to 0 + if logs_delete_after != 0: + log_files = list( + filter( + lambda val: val not in latest_log_files, + os.listdir(logs_path), + ) ) - ) - for log_file in log_files: - log_file_path = os.path.join(logs_path, log_file) - if Helpers.check_file_exists( - log_file_path - ) and Helpers.is_file_older_than_x_days(log_file_path, logs_delete_after): - os.remove(log_file_path) + for log_file in log_files: + log_file_path = os.path.join(logs_path, log_file) + if Helpers.check_file_exists( + log_file_path + ) and Helpers.is_file_older_than_x_days( + log_file_path, logs_delete_after + ): + os.remove(log_file_path)