diff options
author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2014-11-01 19:58:47 (GMT) |
---|---|---|
committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2014-11-01 19:58:47 (GMT) |
commit | c33a0cc61ea763bde926b22492785f3b2b66685c (patch) | |
tree | 3482a45ab4740511bda4076889f6744fe781eb38 /Lib/logging | |
parent | 8083cd6c3bd8970de4bb592a0973169733f32b94 (diff) | |
download | cpython-c33a0cc61ea763bde926b22492785f3b2b66685c.zip cpython-c33a0cc61ea763bde926b22492785f3b2b66685c.tar.gz cpython-c33a0cc61ea763bde926b22492785f3b2b66685c.tar.bz2 |
Brought excluded code into the scope of a try block in SysLogHandler.emit().
Diffstat (limited to 'Lib/logging')
-rw-r--r-- | Lib/logging/handlers.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index b371824..43cbb55 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -879,21 +879,21 @@ 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) - if self.ident: - msg = self.ident + msg - if self.append_nul: - msg += '\000' - - # We need to convert record level to lowercase, maybe this will - # change in the future. - prio = '<%d>' % self.encodePriority(self.facility, - self.mapPriority(record.levelname)) - prio = prio.encode('utf-8') - # Message is a string. Convert to bytes as required by RFC 5424 - msg = msg.encode('utf-8') - msg = prio + msg try: + msg = self.format(record) + if self.ident: + msg = self.ident + msg + if self.append_nul: + msg += '\000' + + # We need to convert record level to lowercase, maybe this will + # change in the future. + prio = '<%d>' % self.encodePriority(self.facility, + self.mapPriority(record.levelname)) + prio = prio.encode('utf-8') + # Message is a string. Convert to bytes as required by RFC 5424 + msg = msg.encode('utf-8') + msg = prio + msg if self.unixsocket: try: self.socket.send(msg) |