diff options
author | Eric Windisch <eric@cloudscaling.com> | 2012-10-11 10:31:10 -0400 |
---|---|---|
committer | Eric Windisch <eric@cloudscaling.com> | 2012-10-11 10:33:24 -0400 |
commit | d7e6b7b34cd93f6e381adb7ffe63212729c589a9 (patch) | |
tree | 86e1b810537445a0cb9c32a7c257b44cee1c2e12 /openstack/common/rpc/impl_zmq.py | |
parent | 8b585cb969a823246a36d5b2cc7eac725e378fca (diff) | |
download | oslo-d7e6b7b34cd93f6e381adb7ffe63212729c589a9.tar.gz oslo-d7e6b7b34cd93f6e381adb7ffe63212729c589a9.tar.xz oslo-d7e6b7b34cd93f6e381adb7ffe63212729c589a9.zip |
Revert "Support declare_topic_consumer in impl_zmq"
Depends on reverted patch. Not used by any code or project.
This was an implementation of an internal AMQP-driver method.
Will determine long-term requirement or replacement
for declare_topic_consumer at Grizzly sumit.
This reverts commit d5095d7effe79c1dcf19a67ff03e00a454662830.
Change-Id: I48883c5011ebccba3e6f987ae48bff871d016bd1
Diffstat (limited to 'openstack/common/rpc/impl_zmq.py')
-rw-r--r-- | openstack/common/rpc/impl_zmq.py | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/openstack/common/rpc/impl_zmq.py b/openstack/common/rpc/impl_zmq.py index 5e373ba..5c9d190 100644 --- a/openstack/common/rpc/impl_zmq.py +++ b/openstack/common/rpc/impl_zmq.py @@ -462,20 +462,6 @@ class ZmqProxy(ZmqBaseReactor): LOG.debug(_("ROUTER RELAY-OUT SUCCEEDED %(data)s") % {'data': data}) -class CallbackReactor(ZmqBaseReactor): - """ - A consumer class passing messages to a callback - """ - - def __init__(self, conf, callback): - self._cb = callback - super(CallbackReactor, self).__init__(conf) - - def consume(self, sock): - data = sock.recv() - self._cb(data[3]) - - class ZmqReactor(ZmqBaseReactor): """ A consumer class implementing a @@ -518,21 +504,6 @@ class Connection(rpc_common.Connection): inaddr = "tcp://%s:%s" % (host, CONF.rpc_zmq_port) reactor.register(proxy, inaddr, zmq.SUB, in_bind=bind) - def declare_topic_consumer(self, topic, callback=None, - queue_name=None): - """declare_topic_consumer is a private method, but - it is being used by Quantum (Folsom). - This has been added compatibility. - """ - # Only consume on the base topic name. - topic = topic.split('.', 1)[0] - - if CONF.rpc_zmq_host in matchmaker.queues("fanout~%s" % (topic, )): - return - - reactor = CallbackReactor(CONF, callback) - self._consume_fanout(reactor, topic, None, bind=False) - def create_consumer(self, topic, proxy, fanout=False): # Only consume on the base topic name. topic = topic.split('.', 1)[0] |