Skip to content

Commit 2901143

Browse files
committed
Added as_string() in LogRecord constructor, and updated tests.
All tests passing on Python2 and Python3.
1 parent ff7f181 commit 2901143

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

supervisor/loggers.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from supervisor.compat import syslog
1717
from supervisor.compat import long
1818
from supervisor.compat import is_text_stream
19+
from supervisor.compat import as_string
1920

2021
class LevelsByName:
2122
CRIT = 50 # messages that probably require immediate user attention
@@ -277,7 +278,7 @@ def doRollover(self):
277278
class LogRecord:
278279
def __init__(self, level, msg, **kw):
279280
self.level = level
280-
self.msg = msg
281+
self.msg = as_string(msg)
281282
self.kw = kw
282283
self.dictrepr = None
283284

supervisor/tests/test_loggers.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,9 +535,12 @@ def asdict(self):
535535
@mock.patch('syslog.syslog', MockSysLog())
536536
def test_emit_ascii_noerror(self):
537537
handler = self._makeOne()
538-
record = self._makeLogRecord('hello!')
538+
record = self._makeLogRecord(b'hello!')
539539
handler.emit(record)
540540
syslog.syslog.assert_called_with('hello!')
541+
record = self._makeLogRecord('hi!')
542+
handler.emit(record)
543+
syslog.syslog.assert_called_with('hi!')
541544

542545
@mock.patch('syslog.syslog', MockSysLog())
543546
def test_close(self):

0 commit comments

Comments
 (0)