Merge pull request #1113 from Abyss-W4tcher/reorder_logging_extra_levels

CLI: Reorder logging extra levels
This commit is contained in:
ikelos
2024-03-17 01:25:33 +00:00
committed by GitHub
2 changed files with 18 additions and 4 deletions
+15 -2
View File
@@ -264,12 +264,14 @@ class CommandLine:
file_logger.setFormatter(file_formatter)
rootlog.addHandler(file_logger)
vollog.info("Logging started")
self.order_extra_verbose_levels()
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)
@@ -695,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
+3 -2
View File
@@ -197,10 +197,11 @@ class VolShell(cli.CommandLine):
vollog.addHandler(file_logger)
vollog.info("Logging started")
self.order_extra_verbose_levels()
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)