Browse Source

Unify processName logging in Python 2 and 3

Stas Rudakou 12 years ago
parent
commit
200c1ddb1e
2 changed files with 1 additions and 10 deletions
  1. 1 4
      celery/app/log.py
  2. 0 6
      celery/utils/log.py

+ 1 - 4
celery/app/log.py

@@ -32,8 +32,6 @@ from celery.utils.log import (
 )
 from celery.utils.term import colored
 
-PY3 = sys.version_info[0] == 3
-
 MP_LOG = os.environ.get('MP_LOG', False)
 
 
@@ -95,8 +93,7 @@ class Logging(object):
         format = format or self.format
         colorize = self.supports_color(colorize, logfile)
         reset_multiprocessing_logger()
-        if not PY3:
-            ensure_process_aware_logger()
+        ensure_process_aware_logger()
         receivers = signals.setup_logging.send(
             sender=None, loglevel=loglevel, logfile=logfile,
             format=format, colorize=colorize,

+ 0 - 6
celery/utils/log.py

@@ -112,12 +112,6 @@ class ColorFormatter(logging.Formatter):
                     type(msg), exc)
                 record.exc_info = True
 
-        if not PY3 and 'processName' not in record.__dict__:
-            # Very ugly, but have to make sure processName is supported
-            # by foreign logger instances.
-            # (processName is always supported by Python 2.7)
-            process_name = current_process and current_process()._name or ''
-            record.__dict__['processName'] = process_name
         return safe_str(logging.Formatter.format(self, record))