issue 4301: patch logging to add processName, remove the old _check_logger_class code
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 513d4dc..c77cde3 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -100,6 +100,11 @@
logThreads = 1
#
+# If you don't want multiprocessing information in the log, set this to zero
+#
+logMultiprocessing = 1
+
+#
# If you don't want process information in the log, set this to zero
#
logProcesses = 1
@@ -266,6 +271,11 @@
else:
self.thread = None
self.threadName = None
+ if logMultiprocessing:
+ from multiprocessing import current_process
+ self.processName = current_process().name
+ else:
+ self.processName = None
if logProcesses and hasattr(os, 'getpid'):
self.process = os.getpid()
else:
diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
index 7d53512..2e7a2ac 100644
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -69,34 +69,10 @@
atexit._exithandlers.remove((_exit_function, (), {}))
atexit._exithandlers.append((_exit_function, (), {}))
- _check_logger_class()
_logger = logging.getLogger(LOGGER_NAME)
return _logger
-def _check_logger_class():
- '''
- Make sure process name is recorded when loggers are used
- '''
- # XXX This function is unnecessary once logging is patched
- import logging
- if hasattr(logging, 'multiprocessing'):
- return
-
- logging._acquireLock()
- try:
- OldLoggerClass = logging.getLoggerClass()
- if not getattr(OldLoggerClass, '_process_aware', False):
- class ProcessAwareLogger(OldLoggerClass):
- _process_aware = True
- def makeRecord(self, *args, **kwds):
- record = OldLoggerClass.makeRecord(self, *args, **kwds)
- record.processName = current_process()._name
- return record
- logging.setLoggerClass(ProcessAwareLogger)
- finally:
- logging._releaseLock()
-
def log_to_stderr(level=None):
'''
Turn on logging and add a handler which prints to stderr
diff --git a/Misc/NEWS b/Misc/NEWS
index f333a92..2ed95a5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -596,6 +596,9 @@
Extension Modules
-----------------
+- Issue #4301: Patch the logging module to add processName support, remove
+ _check_logger_class from multiprocessing.
+
- Issue #2975: When compiling several extension modules with Visual Studio 2008
from the same python interpreter, some environment variables would grow
without limit.