Commit 0376a1f0 authored by Vinay Sajip's avatar Vinay Sajip

Issue #7077: Backported fix from py3k.

parent 60fc3e16
...@@ -786,20 +786,19 @@ class SysLogHandler(logging.Handler): ...@@ -786,20 +786,19 @@ class SysLogHandler(logging.Handler):
The record is formatted, and then sent to the syslog server. If The record is formatted, and then sent to the syslog server. If
exception information is present, it is NOT sent to the server. exception information is present, it is NOT sent to the server.
""" """
msg = self.format(record) msg = self.format(record) + '\000'
""" """
We need to convert record level to lowercase, maybe this will We need to convert record level to lowercase, maybe this will
change in the future. change in the future.
""" """
msg = self.log_format_string % ( prio = '<%d>' % self.encodePriority(self.facility,
self.encodePriority(self.facility, self.mapPriority(record.levelname))
self.mapPriority(record.levelname)), # Message is a string. Convert to bytes as required by RFC 5424
msg) if type(msg) is unicode:
# Treat unicode messages as required by RFC 5424
if _unicode and type(msg) is unicode:
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
if codecs: if codecs:
msg = codecs.BOM_UTF8 + msg msg = codecs.BOM_UTF8 + msg
msg = prio + msg
try: try:
if self.unixsocket: if self.unixsocket:
try: try:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment