Skip to content

Commit 66df10a

Browse files
committed
fix: change log_exception format
1 parent bd43e29 commit 66df10a

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

solnlib/log.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ def log_exception(
352352
"""
353353

354354
msg = _get_exception_message(e, full_msg, msg_before, msg_after)
355-
logger.log(log_level, f'exc_l="{exc_label}" {msg}')
355+
logger.log(log_level, f'exc_l="{exc_label}" | {msg}')
356356

357357

358358
def _get_exception_message(
@@ -367,7 +367,7 @@ def _get_exception_message(
367367
else:
368368
error = traceback.format_exception_only(exc_type, exc_value)
369369

370-
msg_start = msg_before if msg_before is not None else ""
371-
msg_mid = "".join(error)
372-
msg_end = msg_after if msg_after is not None else ""
373-
return f"{msg_start}\n{msg_mid}\n{msg_end}"
370+
msg_start = msg_before + " | " if msg_before is not None else ""
371+
msg_mid = "".join(error).replace("\n", " ").rstrip()
372+
msg_end = " | " + msg_after if msg_after is not None else ""
373+
return f"{msg_start}{msg_mid}{msg_end}"

tests/unit/test_log.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,10 @@ def test_log_exceptions_full_msg():
288288
json.loads(test_jsons)
289289
except Exception as e:
290290
log.log_exception(mock_logger, e, "test type1", msg_before=start_msg)
291+
err_msg = traceback.format_exc().replace("\n", " ").rstrip()
291292
mock_logger.log.assert_called_with(
292293
logging.ERROR,
293-
f'exc_l="test type1" {start_msg}\n{traceback.format_exc()}\n',
294+
f'exc_l="test type1" | {start_msg} | {err_msg}',
294295
)
295296

296297

@@ -312,8 +313,8 @@ def test_log_exceptions_partial_msg():
312313
)
313314
mock_logger.log.assert_called_with(
314315
logging.ERROR,
315-
'exc_l="test type" some msg before exception\njson.decoder.JSONDecodeError: Expecting property '
316-
"name enclosed in double quotes: line 1 column 2 (char 1)\n\nsome msg after exception",
316+
'exc_l="test type" | some msg before exception | json.decoder.JSONDecodeError: Expecting property '
317+
"name enclosed in double quotes: line 1 column 2 (char 1) | some msg after exception",
317318
)
318319

319320

@@ -337,8 +338,9 @@ class AddonComplexError(Exception):
337338
except AddonComplexError as e:
338339
fun = getattr(log, func)
339340
fun(mock_logger, e)
341+
err_msg = traceback.format_exc().replace("\n", " ").rstrip()
340342
mock_logger.log.assert_called_with(
341-
logging.ERROR, f"exc_l={result} \n{traceback.format_exc()}\n"
343+
logging.ERROR, f"exc_l={result} | {err_msg}"
342344
)
343345

344346

0 commit comments

Comments
 (0)