From 8a187ecc010d90ba000632d97999624ee8dee130 Mon Sep 17 00:00:00 2001
From: Eric Windisch <eric@cloudscaling.com>
Date: Thu, 10 Jan 2013 22:56:57 -0500
Subject: reusable ZmqProxy service initialization

Move near-identical proxy setup code
from oslo-zmq-receiver and test_zmq
into ZmqProxy's consume_in_thread method

Provides code reuse and simplifies the
tests and receiver binary.

Change-Id: I1324eacfa2a456599d5fd462b6476ddf659e95c4
---
 bin/oslo-zmq-receiver | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'bin')

diff --git a/bin/oslo-zmq-receiver b/bin/oslo-zmq-receiver
index 4ef24b6..00f4a85 100755
--- a/bin/oslo-zmq-receiver
+++ b/bin/oslo-zmq-receiver
@@ -47,28 +47,7 @@ CONF(sys.argv[1:], project='oslo')
 def main():
     logging.setup("oslo")
 
-    ipc_dir = CONF.rpc_zmq_ipc_dir
-
-    # Create the necessary directories/files for this service.
-    if not os.path.isdir(ipc_dir):
-        try:
-            utils.execute('mkdir', '-p', ipc_dir, run_as_root=True)
-            utils.execute('chown', "%s:%s" % (os.getuid(), os.getgid()),
-                          ipc_dir, run_as_root=True)
-            utils.execute('chmod', '750', ipc_dir, run_as_root=True)
-        except exception.ProcessExecutionError:
-            logging.error(_("Could not create IPC socket directory."))
-            return
-
     with contextlib.closing(impl_zmq.ZmqProxy(CONF)) as reactor:
-        consume_in = "tcp://%s:%s" % \
-            (CONF.rpc_zmq_bind_address,
-             CONF.rpc_zmq_port)
-        consumption_proxy = impl_zmq.InternalContext(None)
-
-        reactor.register(consumption_proxy,
-                         consume_in, zmq.PULL, out_bind=True)
-
         reactor.consume_in_thread()
         reactor.wait()
 
-- 
cgit