Merge branch 'main' into feture_urllib3

celery · Oct 13, 2024 · 6d62a97 · 6d62a97
2 parents ca9211d + 3f5d199
commit 6d62a97
Show file tree

Hide file tree

Showing 10 changed files with 1,649 additions and 2 deletions.
diff --git a/docs/reference/kombu.transport.gcpubsub.rst b/docs/reference/kombu.transport.gcpubsub.rst
@@ -0,0 +1,24 @@
+==============================================================
+ Google Cloud Pub/Sub Transport - ``kombu.transport.gcpubsub``
+==============================================================
+
+.. currentmodule:: kombu.transport.gcpubsub
+
+.. automodule:: kombu.transport.gcpubsub
+
+    .. contents::
+        :local:
+
+    Transport
+    ---------
+
+    .. autoclass:: Transport
+        :members:
+        :undoc-members:
+
+    Channel
+    -------
+
+    .. autoclass:: Channel
+        :members:
+        :undoc-members:
diff --git a/kombu/messaging.py b/kombu/messaging.py
@@ -182,6 +182,7 @@ def publish(self, body, routing_key=None, delivery_mode=None,
                 declare.append(self.exchange)
 
         if retry:
+            self.connection.transport_options.update(retry_policy)
             _publish = self.connection.ensure(self, _publish, **retry_policy)
         return _publish(
             body, priority, content_type, content_encoding,

diff --git a/kombu/transport/__init__.py b/kombu/transport/__init__.py
@@ -43,7 +43,8 @@ def supports_librabbitmq() -> bool | None:
     'etcd': 'kombu.transport.etcd:Transport',
     'azurestoragequeues': 'kombu.transport.azurestoragequeues:Transport',
     'azureservicebus': 'kombu.transport.azureservicebus:Transport',
-    'pyro': 'kombu.transport.pyro:Transport'
+    'pyro': 'kombu.transport.pyro:Transport',
+    'gcpubsub': 'kombu.transport.gcpubsub:Transport',
 }
 
 _transport_cache = {}