Merge pull request apache#1095 from datastax/python-1266

aboudreault · web-flow · commit 2473aae29427 · 2020-10-15T11:31:51.000-04:00
PYTHON-1266: Fix asyncore race condition cause logging exception on shutdown
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,10 @@ Features
 --------
 * Ensure the driver can connect when invalid peer hosts are in system.peers (PYTHON-1260)
 
+Bug Fixes
+---------
+* Asyncore race condition cause logging exception on shutdown (PYTHON-1266)
+
 Others
 ------
 * Drop Python 3.4 support (PYTHON-1220)
diff --git a/cassandra/io/asyncorereactor.py b/cassandra/io/asyncorereactor.py
@@ -36,20 +36,7 @@
 from cassandra.connection import Connection, ConnectionShutdown, NONBLOCKING, Timer, TimerManager
 
 
-# TODO: Remove when Python 2 is removed
-class LogWrapper(object):
-    """ PYTHON-1228. If our logger has disappeared, there's nothing we can do, so just execute nothing """
-    def __init__(self):
-        self._log = logging.getLogger(__name__)
-
-    def __getattr__(self, name):
-        try:
-            return getattr(self._log, name)
-        except:
-            return lambda *args, **kwargs: None
-
-
-log = LogWrapper()
+log = logging.getLogger(__name__)
 
 _dispatcher_map = {}
 
@@ -262,7 +249,13 @@ def _run_loop(self):
                     self._loop_dispatcher.loop(self.timer_resolution)
                     self._timers.service_timeouts()
                 except Exception:
-                    log.debug("Asyncore event loop stopped unexepectedly", exc_info=True)
+                    try:
+                        log.debug("Asyncore event loop stopped unexpectedly", exc_info=True)
+                    except Exception:
+                        # TODO: Remove when Python 2 support is removed
+                        # PYTHON-1266. If our logger has disappeared, there's nothing we
+                        # can do, so just log nothing.
+                        pass
                     break
             self._started = False
 
