Merge "Fall back to UDP if /dev/log does not exist."

Code Issues Proposed changes

This commit is contained in:

Jenkins

2012年09月05日 00:32:57 +00:00

committed by Gerrit Code Review

parent 73846c2c38 314d3b7a85

commit 6e8284ecbd

1 changed files with 2 additions and 1 deletions

@@ -604,7 +604,8 @@ def get_logger(conf, name=None, log_to_console=False, log_route=None,

try:

handler = SysLogHandler(address=log_address, facility=facility)

except socket.error, e:

if e.errno != errno.ENOTSOCK: # Socket operation on non-socket

# Either /dev/log isn't a UNIX socket or it does not exist at all

if e.errno not in [errno.ENOTSOCK, errno.ENOENT]:

raise e

handler = SysLogHandler(facility=facility)

handler.setFormatter(formatter)