Job: updated logging

celery/worker/job.py

@@ -131,7 +131,7 @@ class WorkerTaskTrace(TaskTrace):
                 raise
             except Exception, exc:
                 logger = current_app.log.get_default_logger()
-                logger.error("Process cleanup failed: %r" % (exc, ),
+                logger.error("Process cleanup failed: %r", exc,
                              exc_info=sys.exc_info())
 
     def handle_success(self, retval, *args):
@@ -410,8 +410,8 @@ class TaskRequest(object):
         if self.expires:
             self.maybe_expire()
         if self.task_id in state.revoked:
-            self.logger.warn("Skipping revoked task: %s[%s]" % (
-                self.task_name, self.task_id))
+            self.logger.warn("Skipping revoked task: %s[%s]",
+                             self.task_name, self.task_id)
             self.send_event("task-revoked", uuid=self.task_id)
             self.acknowledge()
             self._already_revoked = True
@@ -430,8 +430,8 @@ class TaskRequest(object):
         if not self.task.acks_late:
             self.acknowledge()
         self.send_event("task-started", uuid=self.task_id, pid=pid)
-        self.logger.debug("Task accepted: %s[%s] pid:%r" % (
-            self.task_name, self.task_id, pid))
+        self.logger.debug("Task accepted: %s[%s] pid:%r",
+                          self.task_name, self.task_id, pid)
         if self._terminate_on_ack is not None:
             _, pool, signal = self._terminate_on_ack
             self.terminate(pool, signal)
@@ -440,12 +440,12 @@ class TaskRequest(object):
         """Handler called if the task times out."""
         state.task_ready(self)
         if soft:
-            self.logger.warning("Soft time limit (%ss) exceeded for %s[%s]" % (
-                timeout, self.task_name, self.task_id))
+            self.logger.warning("Soft time limit (%ss) exceeded for %s[%s]",
+                                timeout, self.task_name, self.task_id)
             exc = exceptions.SoftTimeLimitExceeded(timeout)
         else:
-            self.logger.error("Hard time limit (%ss) exceeded for %s[%s]" % (
-                timeout, self.task_name, self.task_id))
+            self.logger.error("Hard time limit (%ss) exceeded for %s[%s]",
+                              timeout, self.task_name, self.task_id)
             exc = exceptions.TimeLimitExceeded(timeout)
 
         if self._store_errors:
@@ -462,11 +462,10 @@ class TaskRequest(object):
         self.send_event("task-succeeded", uuid=self.task_id,
                         result=safe_repr(ret_value), runtime=runtime)
 
-        self.logger.info(self.success_msg.strip() % {
-                            "id": self.task_id,
-                            "name": self.task_name,
-                            "return_value": self.repr_result(ret_value),
-                            "runtime": runtime})
+        self.logger.info(self.success_msg.strip(), id=self.task_id,
+                         name=self.task_name,
+                         return_value=self.repr_result(ret_value),
+                         runtime=runtime)
 
     def on_retry(self, exc_info):
         """Handler called if the task should be retried."""
@@ -474,10 +473,10 @@ class TaskRequest(object):
                          exception=safe_repr(exc_info.exception.exc),
                          traceback=safe_str(exc_info.traceback))
 
-        self.logger.info(self.retry_msg.strip() % {
-                            "id": self.task_id,
-                            "name": self.task_name,
-                            "exc": safe_repr(exc_info.exception.exc)})
+        self.logger.info(self.retry_msg.strip(),
+                         id=self.task_id,
+                         name=self.task_name,
+                         exc=safe_repr(exc_info.exception.exc))
 
     def on_failure(self, exc_info):
         """Handler called if the task raised an exception."""
@@ -507,11 +506,12 @@ class TaskRequest(object):
                    "args": self.args,
                    "kwargs": self.kwargs}
 
-        self.logger.error(self.error_msg.strip() % context,
+        self.logger.error(self.error_msg.strip(),
                           exc_info=exc_info,
                           extra={"data": {"id": self.task_id,
                                           "name": self.task_name,
-                                          "hostname": self.hostname}})
+                                          "hostname": self.hostname}},
+                          **context)
 
         task_obj = registry.tasks.get(self.task_name, object)
         self.send_error_email(task_obj, context, exc_info.exception,