From 8aa17091b46162e9cdf5b5c63092be82708d7686 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 2 Apr 2014 12:59:45 +0100 Subject: [PATCH] zmq: switch back to not using message envelopes In oslo-incubator, we default to not serializing messages using a message envelope: def _cast(.., envelope=False, ...) except using the v2 notifyer which explicitly passes envelope=True. However, in oslo.messaging, we accidentally switched to using a message envelope: def _send(self, ..., envelope=True): This was not intentional and may be disruptive to users. This issue was identified because the envelope=True path just doesn't work! We don't have any zmq tests in oslo.messaging, but even in oslo-incubator the code path isn't tested and has been broken since I73aad7697cf83ad4aabb3c2058b7cc4f53f783c2 Partial-Bug: #1301132 Change-Id: I6aa2e2ac3cebf443719d64ebcd9eaadc0a9328b8 --- oslo/messaging/_drivers/impl_zmq.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oslo/messaging/_drivers/impl_zmq.py b/oslo/messaging/_drivers/impl_zmq.py index af5b612b2..bbcbcffca 100644 --- a/oslo/messaging/_drivers/impl_zmq.py +++ b/oslo/messaging/_drivers/impl_zmq.py @@ -909,7 +909,7 @@ class ZmqDriver(base.BaseDriver): 'with oslo.config.cfg.CONF') def _send(self, target, ctxt, message, - wait_for_reply=None, timeout=None, envelope=True): + wait_for_reply=None, timeout=None, envelope=False): # FIXME(markmc): remove this temporary hack class Context(object):