summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-02 16:40:03 +0000
committerGerrit Code Review <review@openstack.org>2012-07-02 16:40:03 +0000
commit506486550480fb222a92447e1e8baca855d126aa (patch)
tree26b602818a02d1d8f4098cbfafce4d7008b61dfd
parent619ed56093d2cfdc0b926cd4907156f5e58dc6d2 (diff)
parent55383c9ac3c4a625038728202854b831a292fdd2 (diff)
downloadoslo-506486550480fb222a92447e1e8baca855d126aa.tar.gz
oslo-506486550480fb222a92447e1e8baca855d126aa.tar.xz
oslo-506486550480fb222a92447e1e8baca855d126aa.zip
Merge "Fix missing RPCException from raise"
-rw-r--r--openstack/common/rpc/impl_zmq.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack/common/rpc/impl_zmq.py b/openstack/common/rpc/impl_zmq.py
index 560e649..6bb9aa9 100644
--- a/openstack/common/rpc/impl_zmq.py
+++ b/openstack/common/rpc/impl_zmq.py
@@ -707,7 +707,7 @@ def register_opts(conf):
if mm_path[-1][0] not in string.ascii_uppercase:
LOG.error(_("Matchmaker could not be loaded.\n"
"rpc_zmq_matchmaker is not a class."))
- raise
+ raise RPCException(_("Error loading Matchmaker."))
mm_impl = importutils.import_module(mm_module)
mm_constructor = getattr(mm_impl, mm_class)