Преглед на файлове

Task logger format accidentally not used anymore. Closes #317. Thanks to stugots

Ask Solem преди 14 години
родител
ревизия
324b37a9e5
променени са 2 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 1 1
      celery/app/defaults.py
  2. 2 1
      celery/log.py

+ 1 - 1
celery/app/defaults.py

@@ -16,7 +16,7 @@ DEFAULT_PROCESS_LOG_FMT = """
 """.strip()
 DEFAULT_LOG_FMT = '[%(asctime)s: %(levelname)s] %(message)s'
 DEFAULT_TASK_LOG_FMT = """[%(asctime)s: %(levelname)s/%(processName)s] \
-[%(task_name)s(%(task_id)s)] %(message)s"""
+%(task_name)s[%(task_id)s]: %(message)s"""
 
 
 def str_to_bool(term, table={"false": False, "no": False, "0": False,

+ 2 - 1
celery/log.py

@@ -67,6 +67,7 @@ class Logging(object):
         self.app = app
         self.loglevel = self.app.conf.CELERYD_LOG_LEVEL
         self.format = self.app.conf.CELERYD_LOG_FORMAT
+        self.task_format = self.app.conf.CELERYD_TASK_LOG_FORMAT
         self.colorize = self.app.conf.CELERYD_LOG_COLOR
 
     def supports_color(self, logfile=None):
@@ -176,7 +177,7 @@ class Logging(object):
 
         """
         loglevel = loglevel or self.loglevel
-        format = format or self.format
+        format = format or self.task_format
         if colorize is None:
             colorize = self.supports_color(logfile)