Skip to content

Commit f225491

Browse files
author
Vasileios Karakasis
committed
Fine tune implementation
- `inc_verbosity()` moved to the LoggerAdapter - Fix a couple of bugs - Fix coding style issues
1 parent 12fd825 commit f225491

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

reframe/core/logging.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -363,12 +363,12 @@ def setLevel(self, level):
363363
super().setLevel(level)
364364

365365
@property
366-
def stream_handlers(self):
366+
def std_stream_handlers(self):
367367
if self.logger:
368368
return [h for h in self.logger.handlers
369-
if (isinstance(h, logging.StreamHandler) and
370-
not isinstance(h, logging.FileHandler))]
371-
return []
369+
if h.stream == sys.stdout or h.stream == sys.stderr]
370+
else:
371+
return []
372372

373373
def _update_check_extras(self):
374374
"""Return a dictionary with all the check-specific information."""
@@ -439,6 +439,18 @@ def error(self, message, *args, **kwargs):
439439

440440
super().error(message, *args, **kwargs)
441441

442+
def inc_verbosity(self, num_steps):
443+
"""Convenience function for increasing the verbosity
444+
of the logger step-wise."""
445+
log_levels = sorted(_log_level_names.keys())[1:]
446+
for h in self.std_stream_handlers:
447+
level_idx = log_levels.index(h.level)
448+
if level_idx - num_steps < 0:
449+
new_level = log_levels[0]
450+
else:
451+
new_level = log_levels[level_idx - num_steps]
452+
453+
h.setLevel(new_level)
442454

443455

444456
# A logger that doesn't log anything

reframe/frontend/printer.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,6 @@ def __init__(self):
2020
self.line_width = 78
2121
self.status_width = 10
2222

23-
def inc_verbosity(self, num_steps):
24-
log_levels = sorted(logging._log_level_names.keys())[1:] # [1:] to exclude level NOTSET
25-
for h in self.stream_handlers:
26-
level_idx = log_levels.index(h.level)
27-
try:
28-
new_level = log_levels[level_idx - num_steps]
29-
except IndexError:
30-
new_level = 0
31-
32-
h.setLevel(new_level)
33-
3423
def separator(self, linestyle, msg=''):
3524
if linestyle == 'short double line':
3625
line = self.status_width * '='

0 commit comments

Comments
 (0)