mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-18 14:40:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Brought excluded code into the scope of a try block in SysLogHandler.emit().

Browse source
This commit is contained in:
Vinay Sajip 2014-11-01 19:58:47 +00:00
parent 8083cd6c3b
commit c33a0cc61e
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/logging/handlers.py
View file

@ -879,6 +879,7 @@ 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.
""" """
try:
msg = self.format(record) msg = self.format(record)
if self.ident: if self.ident:
msg = self.ident + msg msg = self.ident + msg
@ -893,7 +894,6 @@ class SysLogHandler(logging.Handler):
# Message is a string. Convert to bytes as required by RFC 5424 # Message is a string. Convert to bytes as required by RFC 5424
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msg = prio + msg msg = prio + msg
try:
if self.unixsocket: if self.unixsocket:
try: try:
self.socket.send(msg) self.socket.send(msg)

3
Misc/NEWS
View file

@ -33,6 +33,9 @@ Core and Builtins
Library Library
------- -------
- Issue #22776: Brought excluded code into the scope of a try block in
SysLogHandler.emit().
- Issue #22665: Add missing get_terminal_size and SameFileError to - Issue #22665: Add missing get_terminal_size and SameFileError to
shutil.__all__. shutil.__all__.