summaryrefslogtreecommitdiff
path: root/Lib/logging
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2014-11-01 19:58:47 +0000
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2014-11-01 19:58:47 +0000
commitce81046f4cb66a3bae49f74e2f7f8a8e31c0b390 (patch)
tree3c3b32d37accdb30d07a8abb0b4a76be575b121a /Lib/logging
parent84f0ef381a6cfd07419b3f42454e76cf755dcece (diff)
downloadcpython-ce81046f4cb66a3bae49f74e2f7f8a8e31c0b390.tar.gz
Brought excluded code into the scope of a try block in SysLogHandler.emit().
Diffstat (limited to 'Lib/logging')
-rw-r--r--Lib/logging/handlers.py28
1 files changed, 14 insertions, 14 deletions
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index b371824054..43cbb55c32 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)