Skip to content

Commit 2d23772

Browse files
committed
cli: Enable debug logs to console
The current handling of loglevels in the snagrecover and snagflash CLIs does not properly apply the requested loglevel to the stdout handler. Correct this. Signed-off-by: Romain Gantois <romain.gantois@bootlin.com>
1 parent 50e0ca2 commit 2d23772

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

src/snagfactory/board.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ def run_recovery(config, soc_family, log_queue):
194194
datefmt="%H:%M:%S",
195195
)
196196
log_handler.setFormatter(log_formatter)
197+
log_handler.setLevel(logging.INFO)
197198
logger.addHandler(log_handler)
198-
logger.setLevel(logging.INFO)
199199

200200
recovery = snagrecover.utils.get_recovery(soc_family)
201201

src/snagfactory/fastboot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ def run_fastboot_task(args, log_queue):
4242
datefmt="%H:%M:%S",
4343
)
4444
log_handler.setFormatter(log_formatter)
45+
log_handler.setLevel(logging.INFO)
4546
logger.addHandler(log_handler)
46-
logger.setLevel(logging.INFO)
4747

4848
try:
4949
fastboot(args)

src/snagflash/cli.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,20 +137,22 @@ def cli():
137137

138138
stdout_formatter = logging.Formatter("[%(levelname)s] %(message)s")
139139
stdout_handler = logging.StreamHandler(sys.stdout)
140-
stdout_handler.setLevel(logging.INFO)
141140
stdout_handler.setFormatter(stdout_formatter)
142-
logger.addHandler(stdout_handler)
141+
stdout_handler.setLevel(logging.INFO)
143142

144143
if args.loglevel != "silent":
145144
file_formatter = logging.Formatter("%(asctime)s [%(levelname)s] %(message)s")
146145
file_handler = logging.FileHandler(args.logfile, encoding="utf-8")
147146
file_handler.setFormatter(file_formatter)
148147
if args.loglevel == "debug":
149148
file_handler.setLevel(logging.DEBUG)
149+
stdout_handler.setLevel(logging.DEBUG)
150150
elif args.loglevel == "info":
151151
file_handler.setLevel(logging.INFO)
152152
logger.addHandler(file_handler)
153153

154+
logger.addHandler(stdout_handler)
155+
154156
# make sure we don't log into the recovery log when importing its modules
155157
recovery_logger = logging.getLogger("snagrecover")
156158
recovery_logger.parent = logger

src/snagrecover/cli.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,20 +118,22 @@ def cli():
118118

119119
stdout_formatter = logging.Formatter("[%(levelname)s] %(message)s")
120120
stdout_handler = logging.StreamHandler(sys.stdout)
121-
stdout_handler.setLevel(logging.INFO)
122121
stdout_handler.setFormatter(stdout_formatter)
123-
logger.addHandler(stdout_handler)
122+
stdout_handler.setLevel(logging.INFO)
124123

125124
if args.loglevel != "silent":
126125
file_formatter = logging.Formatter("%(asctime)s [%(levelname)s] %(message)s")
127126
file_handler = logging.FileHandler(args.logfile, encoding="utf-8")
128127
file_handler.setFormatter(file_formatter)
129128
if args.loglevel == "debug":
130129
logger.setLevel(logging.DEBUG)
130+
stdout_handler.setLevel(logging.DEBUG)
131131
elif args.loglevel == "info":
132132
logger.setLevel(logging.INFO)
133133
logger.addHandler(file_handler)
134134

135+
logger.addHandler(stdout_handler)
136+
135137
# show version
136138
if args.version:
137139
logger.info(f"Snagboot v{__version__}")

0 commit comments

Comments
 (0)