Skip to content

Commit 9bb5027

Browse files
committed
Fixed error with non-string events
1 parent ccb3b56 commit 9bb5027

File tree

4 files changed

+20
-2
lines changed

4 files changed

+20
-2
lines changed

friendlylog/colored_logger.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def _colorize(msg, loglevel):
2626
if loglevel not in [DEBUG, INFO, WARNING, ERROR, CRITICAL]:
2727
raise RuntimeError("{} should be oneof {}.".format(
2828
loglevel, [DEBUG, INFO, WARNING, ERROR, CRITICAL])) # pragma: no cover
29-
msg = str(loglevel).upper() + ": " + msg
29+
msg = str(loglevel).upper() + ": " + str(msg)
3030

3131
if loglevel == DEBUG:
3232
return "{}{}{}{}{}".format(fg(14), attr(1), msg, attr(21), attr(0)) # noqa: E501

friendlylog/simple_logger.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def _process(msg, loglevel):
2525
if loglevel not in [DEBUG, INFO, WARNING, ERROR, CRITICAL]:
2626
raise RuntimeError("{} should be oneof {}.".format(
2727
loglevel, [DEBUG, INFO, WARNING, ERROR, CRITICAL])) # pragma: no cover
28-
msg = str(loglevel).upper() + ": " + msg
28+
msg = str(loglevel).upper() + ": " + str(msg)
2929

3030
return msg
3131

tests/test_colored_logger.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,15 @@ def test_terminal_logging(self):
201201
# 118 (the length without colors) + 4 coloring characters.
202202
self.assertGreaterEqual(len(self.last_line()), 118 + 4)
203203

204+
def test_non_str_logging(self):
205+
logger.info(10)
206+
self.assertIn("10", self.last_line())
207+
208+
# Those should not throw any error.
209+
logger.debug([10, 20, 30])
210+
logger.critical({})
211+
logger.warning(set([-1, 4]))
212+
204213

205214
if __name__ == '__main__':
206215
unittest.main()

tests/test_simple_logger.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,15 @@ def count_in(array, substr):
195195
for level in ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]:
196196
self.assertEqual(count_in(log, level + ": " + msg), 11)
197197

198+
def test_non_str_logging(self):
199+
logger.info(-412413)
200+
self.assertIn("-412413", self.last_line())
201+
202+
# Those should not throw any error.
203+
logger.debug([101, 40, 35])
204+
logger.critical({})
205+
logger.warning(set([-1, 4, 10, -100]))
206+
198207

199208
if __name__ == '__main__':
200209
unittest.main()

0 commit comments

Comments
 (0)