summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-27 21:32:19 +0000
committerGerrit Code Review <review@openstack.org>2013-02-27 21:32:19 +0000
commit8649462b3c66534c75e2e159e5866bf652a3560b (patch)
tree00784a27d7ce0c347a6b9d9defb0eb12a3b0dba7
parentbf6c0871d737da802fbb2e70d2481712ac94a1bd (diff)
parentef933ad295e37c41b8add501fec9ac54ed62d387 (diff)
downloadoslo-8649462b3c66534c75e2e159e5866bf652a3560b.tar.gz
oslo-8649462b3c66534c75e2e159e5866bf652a3560b.tar.xz
oslo-8649462b3c66534c75e2e159e5866bf652a3560b.zip
Merge "zmq: parse receiver CLI opts in main"
-rwxr-xr-xbin/oslo-rpc-zmq-receiver2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/oslo-rpc-zmq-receiver b/bin/oslo-rpc-zmq-receiver
index 7478c8d..5ad6165 100755
--- a/bin/oslo-rpc-zmq-receiver
+++ b/bin/oslo-rpc-zmq-receiver
@@ -39,10 +39,10 @@ from openstack.common.rpc import impl_zmq
CONF = cfg.CONF
CONF.register_opts(rpc.rpc_opts)
CONF.register_opts(impl_zmq.zmq_opts)
-CONF(sys.argv[1:], project='oslo')
def main():
+ CONF(sys.argv[1:], project='oslo')
logging.setup("oslo")
with contextlib.closing(impl_zmq.ZmqProxy(CONF)) as reactor: