expires is now sent with the task-recevied event.

Also fixed some small bugs with the log output of eta and expires

celery/worker/job.py

@@ -470,5 +470,5 @@ class TaskRequest(object):
         return "%s[%s]%s%s" % (
                     self.task_name,
                     self.task_id,
-                    self.eta and " eta:[%s]" % (self.eta, ),
-                    self.expires and " expires:[%s]" % (self.expires, ))
+                    self.eta and " eta:[%s]" % (self.eta, ) or "",
+                    self.expires and " expires:[%s]" % (self.expires, ) or "")

celery/worker/listener.py

@@ -263,7 +263,9 @@ class CarrotListener(object):
 
         self.event_dispatcher.send("task-received", uuid=task.task_id,
                 name=task.task_name, args=repr(task.args),
-                kwargs=repr(task.kwargs), retries=task.retries, eta=task.eta)
+                kwargs=repr(task.kwargs), retries=task.retries,
+                eta=task.eta and task.eta.isoformat(),
+                expires=task.expires and task.expires.isoformat())
 
         if task.eta:
             self.qos.increment()