From 436d355ef301d9cd73883b5129f8b9f744c2ecb7 Mon Sep 17 00:00:00 2001 From: Abyss Watcher Date: Sat, 16 Mar 2024 18:44:09 +0100 Subject: [PATCH 1/5] incrementally order extra log levels --- volatility3/cli/__init__.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/volatility3/cli/__init__.py b/volatility3/cli/__init__.py index 35e977eba..ec9918a65 100644 --- a/volatility3/cli/__init__.py +++ b/volatility3/cli/__init__.py @@ -264,6 +264,17 @@ class CommandLine: file_logger.setFormatter(file_formatter) rootlog.addHandler(file_logger) vollog.info("Logging started") + + for level, level_value in enumerate( + [ + constants.LOGLEVEL_V, + constants.LOGLEVEL_VV, + constants.LOGLEVEL_VVV, + constants.LOGLEVEL_VVVV, + ] + ): + logging.addLevelName(level_value, f"DETAIL {level+1}") + if partial_args.verbosity < 3: if partial_args.verbosity < 1: sys.tracebacklimit = None From 33d653e7a66b8b96350a3568c6d156eadb0cf878 Mon Sep 17 00:00:00 2001 From: Abyss Watcher Date: Sat, 16 Mar 2024 18:44:19 +0100 Subject: [PATCH 2/5] use logging explicit constants --- volatility3/cli/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/volatility3/cli/__init__.py b/volatility3/cli/__init__.py index ec9918a65..116cde114 100644 --- a/volatility3/cli/__init__.py +++ b/volatility3/cli/__init__.py @@ -278,9 +278,9 @@ class CommandLine: if partial_args.verbosity < 3: if partial_args.verbosity < 1: sys.tracebacklimit = None - console.setLevel(30 - (partial_args.verbosity * 10)) + console.setLevel(logging.WARNING - (partial_args.verbosity * 10)) else: - console.setLevel(10 - (partial_args.verbosity - 2)) + console.setLevel(logging.DEBUG - (partial_args.verbosity - 2)) for level, msg in delayed_logs: vollog.log(level, msg) From 745491c846314fb37231c892e2cfab9eed4275f2 Mon Sep 17 00:00:00 2001 From: Abyss Watcher Date: Sat, 16 Mar 2024 22:19:02 +0100 Subject: [PATCH 3/5] put extra log level ordering in a function --- volatility3/cli/__init__.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/volatility3/cli/__init__.py b/volatility3/cli/__init__.py index 116cde114..457a49311 100644 --- a/volatility3/cli/__init__.py +++ b/volatility3/cli/__init__.py @@ -265,16 +265,7 @@ class CommandLine: rootlog.addHandler(file_logger) vollog.info("Logging started") - for level, level_value in enumerate( - [ - constants.LOGLEVEL_V, - constants.LOGLEVEL_VV, - constants.LOGLEVEL_VVV, - constants.LOGLEVEL_VVVV, - ] - ): - logging.addLevelName(level_value, f"DETAIL {level+1}") - + self.order_extra_verbose_levels() if partial_args.verbosity < 3: if partial_args.verbosity < 1: sys.tracebacklimit = None @@ -706,6 +697,17 @@ class CommandLine: ) context.config[extended_path] = value + def order_extra_verbose_levels(self): + for level, level_value in enumerate( + [ + constants.LOGLEVEL_V, + constants.LOGLEVEL_VV, + constants.LOGLEVEL_VVV, + constants.LOGLEVEL_VVVV, + ] + ): + logging.addLevelName(level_value, f"DETAIL {level+1}") + def file_handler_class_factory(self, direct=True): output_dir = self.output_dir From 7ff5f57e5d4485ad2e5f2ad4dc78017880442c05 Mon Sep 17 00:00:00 2001 From: Abyss Watcher Date: Sat, 16 Mar 2024 22:19:28 +0100 Subject: [PATCH 4/5] use logging explicit constants --- volatility3/cli/volshell/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/volatility3/cli/volshell/__init__.py b/volatility3/cli/volshell/__init__.py index 9e74acfec..998c8245b 100644 --- a/volatility3/cli/volshell/__init__.py +++ b/volatility3/cli/volshell/__init__.py @@ -198,9 +198,9 @@ class VolShell(cli.CommandLine): vollog.info("Logging started") if partial_args.verbosity < 3: - console.setLevel(30 - (partial_args.verbosity * 10)) + console.setLevel(logging.WARNING - (partial_args.verbosity * 10)) else: - console.setLevel(10 - (partial_args.verbosity - 2)) + console.setLevel(logging.DEBUG - (partial_args.verbosity - 2)) for level, msg in delayed_logs: vollog.log(level, msg) From de4a3359982b67b74a354001d380502ff41804d1 Mon Sep 17 00:00:00 2001 From: Abyss Watcher Date: Sat, 16 Mar 2024 22:19:45 +0100 Subject: [PATCH 5/5] call extra verbose level ordering --- volatility3/cli/volshell/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/volatility3/cli/volshell/__init__.py b/volatility3/cli/volshell/__init__.py index 998c8245b..035ed9b2e 100644 --- a/volatility3/cli/volshell/__init__.py +++ b/volatility3/cli/volshell/__init__.py @@ -197,6 +197,7 @@ class VolShell(cli.CommandLine): vollog.addHandler(file_logger) vollog.info("Logging started") + self.order_extra_verbose_levels() if partial_args.verbosity < 3: console.setLevel(logging.WARNING - (partial_args.verbosity * 10)) else: