diff options
author | Ask Solem <askh@opera.com> | 2010-08-02 12:39:09 +0200 |
---|---|---|
committer | Ask Solem <askh@opera.com> | 2010-08-02 12:39:09 +0200 |
commit | 1492b7c689f34be225a343bfc20688eeebd22ac0 (patch) | |
tree | 798d76900b56fc8a8265c5544de5442b60eaaaf6 /kombu/backends/pyamqplib.py | |
parent | a3f67ffce88ad461b7a50d76d4dc4ae286b83745 (diff) | |
download | kombu-1492b7c689f34be225a343bfc20688eeebd22ac0.tar.gz |
amqplib's handshake mistakenly identifies as protocol version 1191,
this breaks in RabbitMQ tip, which no longer falls back to
0-8 for unknown ids.
Diffstat (limited to 'kombu/backends/pyamqplib.py')
-rw-r--r-- | kombu/backends/pyamqplib.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kombu/backends/pyamqplib.py b/kombu/backends/pyamqplib.py index 44d5aa4d..1edca524 100644 --- a/kombu/backends/pyamqplib.py +++ b/kombu/backends/pyamqplib.py @@ -1,6 +1,7 @@ import socket from amqplib import client_0_8 as amqp +frmo amqplib.client_0_8 import transport from amqplib.client_0_8.channel import Channel from amqplib.client_0_8.exceptions import AMQPConnectionException from amqplib.client_0_8.exceptions import AMQPChannelException @@ -9,6 +10,11 @@ from kombu.backends.base import BaseMessage, BaseBackend DEFAULT_PORT = 5672 +# amqplib's handshake mistakenly identifies as protocol version 1191, +# this breaks in RabbitMQ tip, which no longer falls back to +# 0-8 for unknown ids. +transport.AMQP_PROTOCOL_HEADER = "AMQP\x01\x01\x08\x00" + class Connection(amqp.Connection): def _dispatch_basic_return(self, channel, args, msg): |