From 314d36e0dc9577289befec41ecd0e6e31f2ed6ee Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Wed, 4 Dec 2024 15:28:18 -0800 Subject: [PATCH] fixReporter --- etc/report_generator.py | 4 ++-- etc/report_generator5.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/report_generator.py b/etc/report_generator.py index 49a85df..9ef76b7 100644 --- a/etc/report_generator.py +++ b/etc/report_generator.py @@ -57,7 +57,7 @@ def parse_log_file(file_path): if multiLogReader: # set file_path to the cwd of the default project ../log log_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'logs') - log_files = glob.glob(os.path.join(log_dir, 'meshbot*.log')) + log_files = glob.glob(os.path.join(log_dir, 'meshbot.log.*')) print(f"Checking log files: {log_files}") if log_files: @@ -745,7 +745,7 @@ def generate_main_html(log_data, system_info): """ template = Template(html_template) return template.safe_substitute( - date=datetime.now().strftime('%Y_%m_%d'), + date=datetime.now().strftime('%Y-%m-%d'), command_data=json.dumps(log_data['command_counts']), message_data=json.dumps(log_data['message_types']), activity_data=json.dumps(log_data['hourly_activity']), diff --git a/etc/report_generator5.py b/etc/report_generator5.py index e19ca0a..18b0848 100644 --- a/etc/report_generator5.py +++ b/etc/report_generator5.py @@ -58,7 +58,7 @@ def parse_log_file(file_path): if multiLogReader: # set file_path to the cwd of the default project ../log log_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'logs') - log_files = glob.glob(os.path.join(log_dir, 'meshbot*.log')) + log_files = glob.glob(os.path.join(log_dir, 'meshbot.log.*')) print(f"Checking log files: {log_files}") if log_files: @@ -1036,7 +1036,7 @@ options: { template = Template(html_template) return template.safe_substitute( - date=datetime.now().strftime('%Y_%m_%d'), + date=datetime.now().strftime('%Y-%m-%d'), command_data=json.dumps(log_data['command_counts']), message_data=json.dumps(log_data['message_types']), activity_data=json.dumps(log_data['hourly_activity']),