From e900b494cb8cd75eb54ec105cd120476fed0a1be Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Fri, 3 Sep 2010 09:06:07 +0000 Subject: Issue #7077: Backported fix from py3k. --- Lib/logging/handlers.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 38beb10..472eee5 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -786,20 +786,19 @@ 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) + msg = self.format(record) + '\000' """ We need to convert record level to lowercase, maybe this will change in the future. """ - msg = self.log_format_string % ( - self.encodePriority(self.facility, - self.mapPriority(record.levelname)), - msg) - # Treat unicode messages as required by RFC 5424 - if _unicode and type(msg) is unicode: + prio = '<%d>' % self.encodePriority(self.facility, + self.mapPriority(record.levelname)) + # Message is a string. Convert to bytes as required by RFC 5424 + if type(msg) is unicode: msg = msg.encode('utf-8') if codecs: msg = codecs.BOM_UTF8 + msg + msg = prio + msg try: if self.unixsocket: try: -- cgit v0.12