Accept TTL as seconds and as a float

celery · Feb 12, 2015 · c5eacda · cooncesean · Jun 12, 2018 · clokep
1 parent ce3efb9
commit c5eacda
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/kombu/messaging.py b/kombu/messaging.py
@@ -138,7 +138,7 @@ def publish(self, body, routing_key=None, delivery_mode=None,
             connection is lost.
         :keyword retry_policy: Retry configuration, this is the keywords
             supported by :meth:`~kombu.Connection.ensure`.
-        :keyword expiration: A TTL can be specified on a per-message basis.
+        :keyword expiration: A TTL in seconds can be specified per message.
             Default is no expiration.
         :keyword \*\*properties: Additional message properties, see AMQP spec.
 
@@ -158,7 +158,7 @@ def publish(self, body, routing_key=None, delivery_mode=None,
             delivery_mode = DELIVERY_MODES[delivery_mode]
         properties['delivery_mode'] = delivery_mode
         if expiration is not None:
-            properties['expiration'] = str(expiration)
+            properties['expiration'] = str(int(expiration*1000))
 
         body, content_type, content_encoding = self._prepare(
             body, serializer, content_type, content_encoding,