From 6e409a0a2f196eca1d51b461b395fc4474fafc29 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Wed, 3 Jul 2024 18:23:26 +0200 Subject: [PATCH] System: Log Files: Boot - empty log view due to minor regression in https://github.com/opnsense/core/commit/c522ecac65954d64bf8401593a166709f71fdbfd --- src/opnsense/scripts/syslog/log_matcher.py | 4 ++-- src/opnsense/scripts/syslog/queryLog.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/opnsense/scripts/syslog/log_matcher.py b/src/opnsense/scripts/syslog/log_matcher.py index a2009a15c..f6e8e6148 100755 --- a/src/opnsense/scripts/syslog/log_matcher.py +++ b/src/opnsense/scripts/syslog/log_matcher.py @@ -140,8 +140,8 @@ class LogMatcher: filenames = glob.glob("%s/%s_*.log" % (log_basename, log_basename.split('/')[-1].split('.')[0])) for filename in sorted(filenames, reverse=True): log_filenames.append(filename) - # legacy log output is always stashed last - log_filenames.append("%s.log" % log_basename) + # legacy log output is always stashed last + log_filenames.append("%s.log" % log_basename) if module != 'core': log_filenames.append("/var/log/%s_%s.log" % (module, os.path.basename(filename))) diff --git a/src/opnsense/scripts/syslog/queryLog.py b/src/opnsense/scripts/syslog/queryLog.py index eb84c5dd2..fe2bcb6dd 100755 --- a/src/opnsense/scripts/syslog/queryLog.py +++ b/src/opnsense/scripts/syslog/queryLog.py @@ -52,7 +52,6 @@ if __name__ == '__main__': if inputargs.filename != "": limit = int(inputargs.limit) if inputargs.limit.isdigit() else 0 offset = int(inputargs.offset) if inputargs.offset.isdigit() else 0 - severity = inputargs.severity.split(',') if inputargs.severity.strip() != '' else [] log_matcher = LogMatcher(inputargs.filter, inputargs.filename, inputargs.module, inputargs.severity) for record in log_matcher.match_records(): result['total_rows'] += 1