Merged fix for issue #12168 from 3.2.

This commit is contained in:
Vinay Sajip 2011-06-09 16:55:23 +01:00
commit 8dd8d582e3
3 changed files with 14 additions and 3 deletions

View file

@ -769,6 +769,8 @@ class SysLogHandler(logging.Handler):
"""
return self.priority_map.get(levelName, "warning")
append_nul = True # some old syslog daemons expect a NUL terminator
def emit(self, record):
"""
Emit a record.
@ -776,7 +778,9 @@ class SysLogHandler(logging.Handler):
The record is formatted, and then sent to the syslog server. If
exception information is present, it is NOT sent to the server.
"""
msg = self.format(record) + '\000'
msg = self.format(record)
if self.append_nul:
msg += '\000'
"""
We need to convert record level to lowercase, maybe this will
change in the future.