summaryrefslogtreecommitdiff
path: root/docs/userguide
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2014-05-20 19:30:05 +0100
committerAsk Solem <ask@celeryproject.org>2014-05-20 19:30:05 +0100
commitbd6c5bed2ba7c4f43ecb66adf83798cb152106b9 (patch)
tree155eadca91d7eef3a46d6fc802d7f2678c3efdf0 /docs/userguide
parent81ccd384aaa218c019006e9428b3b0fc5f54e9f1 (diff)
parent3dd3d71eb6ecb422ba73176ce3ed6ae62337d4f0 (diff)
downloadkombu-bd6c5bed2ba7c4f43ecb66adf83798cb152106b9.tar.gz
Merge branch 'daevaorn/priority'
Diffstat (limited to 'docs/userguide')
-rw-r--r--docs/userguide/connections.rst50
1 files changed, 27 insertions, 23 deletions
diff --git a/docs/userguide/connections.rst b/docs/userguide/connections.rst
index f97b4b79..38037a29 100644
--- a/docs/userguide/connections.rst
+++ b/docs/userguide/connections.rst
@@ -145,29 +145,31 @@ transport URL, or use ``amqp`` to have the fallback.
Transport Comparison
====================
-+---------------+----------+------------+------------+---------------+
-| **Client** | **Type** | **Direct** | **Topic** | **Fanout** |
-+---------------+----------+------------+------------+---------------+
-| *amqp* | Native | Yes | Yes | Yes |
-+---------------+----------+------------+------------+---------------+
-| *redis* | Virtual | Yes | Yes | Yes (PUB/SUB) |
-+---------------+----------+------------+------------+---------------+
-| *mongodb* | Virtual | Yes | Yes | Yes |
-+---------------+----------+------------+------------+---------------+
-| *beanstalk* | Virtual | Yes | Yes [#f1]_ | No |
-+---------------+----------+------------+------------+---------------+
-| *SQS* | Virtual | Yes | Yes [#f1]_ | Yes [#f2]_ |
-+---------------+----------+------------+------------+---------------+
-| *couchdb* | Virtual | Yes | Yes [#f1]_ | No |
-+---------------+----------+------------+------------+---------------+
-| *zookeeper* | Virtual | Yes | Yes [#f1]_ | No |
-+---------------+----------+------------+------------+---------------+
-| *in-memory* | Virtual | Yes | Yes [#f1]_ | No |
-+---------------+----------+------------+------------+---------------+
-| *django* | Virtual | Yes | Yes [#f1]_ | No |
-+---------------+----------+------------+------------+---------------+
-| *sqlalchemy* | Virtual | Yes | Yes [#f1]_ | No |
-+---------------+----------+------------+------------+---------------+
++---------------+----------+------------+------------+---------------+--------------+
+| **Client** | **Type** | **Direct** | **Topic** | **Fanout** | **Priority** |
++---------------+----------+------------+------------+---------------+--------------+
+| *amqp* | Native | Yes | Yes | Yes | Yes [#f3]_ |
++---------------+----------+------------+------------+---------------+--------------+
+| *redis* | Virtual | Yes | Yes | Yes (PUB/SUB) | Yes |
++---------------+----------+------------+------------+---------------+--------------+
+| *mongodb* | Virtual | Yes | Yes | Yes | Yes |
++---------------+----------+------------+------------+---------------+--------------+
+| *beanstalk* | Virtual | Yes | Yes [#f1]_ | No | Yes |
++---------------+----------+------------+------------+---------------+--------------+
+| *SQS* | Virtual | Yes | Yes [#f1]_ | Yes [#f2]_ | No |
++---------------+----------+------------+------------+---------------+--------------+
+| *couchdb* | Virtual | Yes | Yes [#f1]_ | No | No |
++---------------+----------+------------+------------+---------------+--------------+
+| *zookeeper* | Virtual | Yes | Yes [#f1]_ | No | Yes |
++---------------+----------+------------+------------+---------------+--------------+
+| *in-memory* | Virtual | Yes | Yes [#f1]_ | No | No |
++---------------+----------+------------+------------+---------------+--------------+
+| *django* | Virtual | Yes | Yes [#f1]_ | No | No |
++---------------+----------+------------+------------+---------------+--------------+
+| *sqlalchemy* | Virtual | Yes | Yes [#f1]_ | No | No |
++---------------+----------+------------+------------+---------------+--------------+
+| *SLMQ* | Virtual | Yes | Yes [#f1]_ | No | No |
++---------------+----------+------------+------------+---------------+--------------+
.. [#f1] Declarations only kept in memory, so exchanges/queues
@@ -176,3 +178,5 @@ Transport Comparison
.. [#f2] Fanout supported via storing routing tables in SimpleDB.
Disabled by default, but can be enabled by using the
``supports_fanout`` transport option.
+
+.. [#f3] AMQP Message priority support depends on broker implementation.