From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Fri, 10 Sep 2010 08:25:13 +0000 (+0000)
Subject: logging: Added threading interlock in basicConfig().
X-Git-Tag: v3.2a3~352
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2314fc729b7192a041ae7630febdc376519b8b9a;p=python

logging: Added threading interlock in basicConfig().
---

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index ddbe8ab5b0..0e013565ce 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1459,22 +1459,28 @@ def basicConfig(**kwargs):
     using sys.stdout or sys.stderr), whereas FileHandler closes its stream
     when the handler is closed.
     """
-    if len(root.handlers) == 0:
-        filename = kwargs.get("filename")
-        if filename:
-            mode = kwargs.get("filemode", 'a')
-            hdlr = FileHandler(filename, mode)
-        else:
-            stream = kwargs.get("stream")
-            hdlr = StreamHandler(stream)
-        fs = kwargs.get("format", BASIC_FORMAT)
-        dfs = kwargs.get("datefmt", None)
-        fmt = Formatter(fs, dfs)
-        hdlr.setFormatter(fmt)
-        root.addHandler(hdlr)
-        level = kwargs.get("level")
-        if level is not None:
-            root.setLevel(level)
+    # Add thread safety in case someone mistakenly calls
+    # basicConfig() from multiple threads
+    _acquireLock()
+    try:
+        if len(root.handlers) == 0:
+            filename = kwargs.get("filename")
+            if filename:
+                mode = kwargs.get("filemode", 'a')
+                hdlr = FileHandler(filename, mode)
+            else:
+                stream = kwargs.get("stream")
+                hdlr = StreamHandler(stream)
+            fs = kwargs.get("format", BASIC_FORMAT)
+            dfs = kwargs.get("datefmt", None)
+            fmt = Formatter(fs, dfs)
+            hdlr.setFormatter(fmt)
+            root.addHandler(hdlr)
+            level = kwargs.get("level")
+            if level is not None:
+                root.setLevel(level)
+    finally:
+        _releaseLock()
 
 #---------------------------------------------------------------------------
 # Utility functions at module level.