Issue #11444: Merge fix from 3.1.

d9512e9a · Vinay Sajip · 3d995843 · c8ab6eeb · d9512e9a
Commit d9512e9a authored Mar 08, 2011 by Vinay Sajip
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

Lib/logging/__init__.py Lib/logging/__init__.py +3 -0

No files found.
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1793,6 +1793,7 @@ def shutdown(handlerList=_handlerList):
            h = wr()
            if h:
                try:
+                    h.acquire()
                    h.flush()
                    h.close()
                except (IOError, ValueError):
@@ -1801,6 +1802,8 @@ def shutdown(handlerList=_handlerList):
                    # references to them are still around at
                    # application exit.
                    pass
+                finally:
+                    h.release()
        except:
            if raiseExceptions:
                raise