mirror of
https://github.com/python/cpython.git
synced 2025-08-19 16:20:59 +00:00
Issue #7120: logging: Removed import of multiprocessing which is causing crash in GAE.
This commit is contained in:
parent
7f7327014c
commit
dd3aa9afee
2 changed files with 11 additions and 10 deletions
|
@ -273,12 +273,10 @@ class LogRecord:
|
|||
self.threadName = None
|
||||
if not logMultiprocessing:
|
||||
self.processName = None
|
||||
elif 'multiprocessing' not in sys.modules:
|
||||
self.processName = 'MainProcess'
|
||||
else:
|
||||
try:
|
||||
from multiprocessing import current_process
|
||||
self.processName = current_process().name
|
||||
except ImportError:
|
||||
self.processName = None
|
||||
self.processName = sys.modules['multiprocessing'].current_process().name
|
||||
if logProcesses and hasattr(os, 'getpid'):
|
||||
self.process = os.getpid()
|
||||
else:
|
||||
|
|
|
@ -18,6 +18,9 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #7120: logging: Removed import of multiprocessing which is causing
|
||||
crash in GAE.
|
||||
|
||||
- Issue #7115: Fixed the extension module builds that is failing when using
|
||||
paths in the extension name instead of dotted names.
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue