summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--oslo_messaging/_cmd/zmq_broker.py5
-rw-r--r--oslo_messaging/_drivers/impl_zmq.py2
2 files changed, 3 insertions, 4 deletions
diff --git a/oslo_messaging/_cmd/zmq_broker.py b/oslo_messaging/_cmd/zmq_broker.py
index 0f8fd14..08f3d0a 100644
--- a/oslo_messaging/_cmd/zmq_broker.py
+++ b/oslo_messaging/_cmd/zmq_broker.py
@@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-import contextlib
import logging
import sys
import time
@@ -33,8 +32,8 @@ def main():
CONF(sys.argv[1:], project='oslo')
logging.basicConfig(level=logging.DEBUG)
- with contextlib.closing(zmq_broker.ZmqBroker(CONF)) as reactor:
- reactor.start()
+ reactor = zmq_broker.ZmqBroker(CONF)
+ reactor.start()
while True:
time.sleep(1)
diff --git a/oslo_messaging/_drivers/impl_zmq.py b/oslo_messaging/_drivers/impl_zmq.py
index 4b81f7e..f6518cb 100644
--- a/oslo_messaging/_drivers/impl_zmq.py
+++ b/oslo_messaging/_drivers/impl_zmq.py
@@ -70,7 +70,7 @@ zmq_opts = [
help='Expiration timeout in seconds of a name service record '
'about existing target ( < 0 means no timeout).'),
- cfg.BoolOpt('use_pub_sub', default=False,
+ cfg.BoolOpt('use_pub_sub', default=True,
help='Use PUB/SUB pattern for fanout methods. '
'PUB/SUB always uses proxy.'),