diff options
author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2017-03-17 19:52:56 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-17 19:52:56 (GMT) |
commit | 46e81d3345b979f835740a228857906dca0f59c0 (patch) | |
tree | bb3e194ddd1e315a7bcd80939281aaeb879d3b2b | |
parent | 948171bf999cf8b3e12048851041d2e04ae3a78c (diff) | |
download | cpython-46e81d3345b979f835740a228857906dca0f59c0.zip cpython-46e81d3345b979f835740a228857906dca0f59c0.tar.gz cpython-46e81d3345b979f835740a228857906dca0f59c0.tar.bz2 |
bpo-29808: Do not fail in SysLogHandler constructor if syslog isn't available. (#696)
bpo-29808: SysLogHandler: Do not fail if initial connect to syslog failed.
(cherry picked from commit 1b038e073807ecb6fd176edaf3386a8e3205416e)
-rw-r--r-- | Lib/logging/handlers.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 7d77973..2356f8d 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -815,7 +815,14 @@ class SysLogHandler(logging.Handler): if isinstance(address, str): self.unixsocket = True - self._connect_unixsocket(address) + # Syslog server may be unavailable during handler initialisation. + # C's openlog() function also ignores connection errors. + # Moreover, we ignore these errors while logging, so it not worse + # to ignore it also here. + try: + self._connect_unixsocket(address) + except OSError: + pass else: self.unixsocket = False if socktype is None: |