diff options
| author | Gordon Sim <gsim@apache.org> | 2012-04-11 12:03:58 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2012-04-11 12:03:58 +0000 |
| commit | 3e7d61333f81813eec0574f9c28e9ac65c588824 (patch) | |
| tree | 68975d235b948d5b679eeb0a94217fa7fc6c6c4f | |
| parent | 40d47cc521ce4a9cc4da5d51ae3aa720b29807f5 (diff) | |
| download | qpid-python-3e7d61333f81813eec0574f9c28e9ac65c588824.tar.gz | |
QPID-3943: Make topic subscriptions unreliable by default
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1324719 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/python/qpid/messaging/driver.py | 6 | ||||
| -rw-r--r-- | qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/qpid/python/qpid/messaging/driver.py b/qpid/python/qpid/messaging/driver.py index 0358659111..3cb62d75c9 100644 --- a/qpid/python/qpid/messaging/driver.py +++ b/qpid/python/qpid/messaging/driver.py @@ -226,7 +226,11 @@ class LinkIn: def do_link(self, sst, rcv, _rcv, type, subtype, action): link_opts = _rcv.options.get("link", {}) - reliability = link_opts.get("reliability", "at-least-once") + if type == "topic": + default_reliability = "unreliable" + else: + default_reliability = "at-least-once" + reliability = link_opts.get("reliability", default_reliability) declare = link_opts.get("x-declare", {}) subscribe = link_opts.get("x-subscribe", {}) acq_mode = acquire_mode.pre_acquired diff --git a/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py b/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py index 5e03a7b487..05c4815e57 100644 --- a/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py +++ b/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py @@ -57,7 +57,7 @@ class GeneralTests(Base): sess2 = self.setup_session() tx = sess1.sender("amq.direct/key") - rx_main = sess1.receiver("amq.direct/key;{link:{x-declare:{alternate-exchange:'amq.fanout'}}}") + rx_main = sess1.receiver("amq.direct/key;{link:{reliability:at-least-once,x-declare:{alternate-exchange:'amq.fanout'}}}") rx_alt = sess2.receiver("amq.fanout") rx_alt.capacity = 10 |