diff options
| author | ZhiQiang Fan <aji.zqfan@gmail.com> | 2016-06-02 20:19:28 +0800 |
|---|---|---|
| committer | ZhiQiang Fan <aji.zqfan@gmail.com> | 2016-06-02 21:41:08 +0800 |
| commit | d7f8ce94e433da8af3660ecf52715a04c221fde5 (patch) | |
| tree | 4e957f631a3996c3902a8d08c8e816a68c1dbc8e /ceilometer/messaging.py | |
| parent | c4286d672f2c51ac2257e981487db6e62a889d8f (diff) | |
| download | ceilometer-d7f8ce94e433da8af3660ecf52715a04c221fde5.tar.gz | |
catch DriverLoadFailure for get_transport optional
new oslo.messaging 5.2.0 release will raise
oslo_messaging.transport.DriverLoadFailure if no existent transport
driver, hence breaks our code and unit test as well.
This patch fixes it by adding DriverLoadFailure to catch list.
Change-Id: I02b5d1b3f4a9169cbf428a5eff9c6705494741af
Closes-Bug: #1588151
Diffstat (limited to 'ceilometer/messaging.py')
| -rw-r--r-- | ceilometer/messaging.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ceilometer/messaging.py b/ceilometer/messaging.py index 0f393d2c..7b325077 100644 --- a/ceilometer/messaging.py +++ b/ceilometer/messaging.py @@ -33,8 +33,9 @@ def get_transport(url=None, optional=False, cache=True): if not transport or not cache: try: transport = oslo_messaging.get_transport(cfg.CONF, url) - except oslo_messaging.InvalidTransportURL as e: - if not optional or e.url: + except (oslo_messaging.InvalidTransportURL, + oslo_messaging.DriverLoadFailure): + if not optional or url: # NOTE(sileht): oslo_messaging is configured but unloadable # so reraise the exception raise |