diff options
| author | Brian Bouterse <bmbouter@gmail.com> | 2014-06-11 09:17:45 -0400 |
|---|---|---|
| committer | Brian Bouterse <bmbouter@gmail.com> | 2014-06-11 09:17:45 -0400 |
| commit | 286672f2eca9f497c44e34f1535cf5d166f0813a (patch) | |
| tree | 061e0b1370a39fa3c777d6d56fd10114f9cbefdf | |
| parent | 84763bd0ed4495862e33fc078a5e064f5661a86b (diff) | |
| parent | ed628bf9168fdd9074f28eaa7960ef2ebe9ea071 (diff) | |
| download | kombu-286672f2eca9f497c44e34f1535cf5d166f0813a.tar.gz | |
Merge branch 'pulp-dep-3.0.15-with-qpid' into qpid-transport
| -rw-r--r-- | kombu/tests/transport/test_qpid.py | 11 | ||||
| -rw-r--r-- | kombu/transport/qpid.py | 6 |
2 files changed, 3 insertions, 14 deletions
diff --git a/kombu/tests/transport/test_qpid.py b/kombu/tests/transport/test_qpid.py index 2ef44f18..782fdef1 100644 --- a/kombu/tests/transport/test_qpid.py +++ b/kombu/tests/transport/test_qpid.py @@ -807,8 +807,7 @@ class TestChannel(ExtraAssertionsMixin, Case): 'durable': mock_durable, 'exclusive': mock_exclusive, 'auto-delete': mock_auto_delete, - 'arguments': mock_arguments, - 'qpid.auto_delete_timeout': 3} + 'arguments': mock_arguments} mock_consumer_count = Mock() mock_return_value = Mock() values_dict = {'msgDepth': mock_msg_count, @@ -844,7 +843,6 @@ class TestChannel(ExtraAssertionsMixin, Case): 'exclusive': False, 'auto-delete': True, 'arguments': None, - 'qpid.auto_delete_timeout': 3, 'qpid.policy_type': 'ring'} mock_msg_count = Mock() mock_consumer_count = Mock() @@ -869,7 +867,6 @@ class TestChannel(ExtraAssertionsMixin, Case): 'exclusive': False, 'auto-delete': True, 'arguments': None, - 'qpid.auto_delete_timeout': 3, 'qpid.policy_type': 'ring'} mock_msg_count = Mock() mock_consumer_count = Mock() @@ -893,8 +890,7 @@ class TestChannel(ExtraAssertionsMixin, Case): 'durable': False, 'exclusive': False, 'auto-delete': True, - 'arguments': None, - 'qpid.auto_delete_timeout': 3} + 'arguments': None} mock_msg_count = Mock() mock_consumer_count = Mock() values_dict = {'msgDepth': mock_msg_count, @@ -918,8 +914,7 @@ class TestChannel(ExtraAssertionsMixin, Case): 'durable': False, 'exclusive': False, 'auto-delete': True, - 'arguments': None, - 'qpid.auto_delete_timeout': 3} + 'arguments': None} mock_msg_count = Mock() mock_consumer_count = Mock() values_dict = {'msgDepth': mock_msg_count, diff --git a/kombu/transport/qpid.py b/kombu/transport/qpid.py index 2c2998aa..8ca19459 100644 --- a/kombu/transport/qpid.py +++ b/kombu/transport/qpid.py @@ -216,9 +216,6 @@ DEFAULT_PORT = 5672 OBJECT_ALREADY_EXISTS_STRING = 'object already exists' -# number of seconds to keep a queue around before deleting it. -AUTO_DELETE_TIMEOUT = 3 - VERSION = (1, 0, 0) __version__ = '.'.join(map(str, VERSION)) @@ -716,8 +713,6 @@ class Channel(base.StdChannel): have finished using it. The last consumer can be cancelled either explicitly or because its channel is closed. If there was no consumer ever on the queue, it won't be deleted. Default is True. - Each queue has an auto_delete timeout, which is set to 3, meaning - that queues deletion due to auto_delete will be delayed by 3 seconds. The nowait parameter is unused. It was part of the 0-9-1 protocol, but this AMQP client implements 0-10 which removed the nowait option. @@ -768,7 +763,6 @@ class Channel(base.StdChannel): 'exclusive': exclusive, 'auto-delete': auto_delete, 'arguments': arguments} - options['qpid.auto_delete_timeout'] = AUTO_DELETE_TIMEOUT if queue.startswith('celeryev') or queue.endswith('pidbox'): options['qpid.policy_type'] = 'ring' try: |