diff options
| author | Julien Danjou <julien@danjou.info> | 2017-09-05 16:40:06 +0200 |
|---|---|---|
| committer | Julien Danjou <julien@danjou.info> | 2017-09-05 16:40:47 +0200 |
| commit | 3ed9ed1a0f03dbcc6cad9b3e21664e2380dad62a (patch) | |
| tree | 7367f9e71b2e926337c57cd34f6930de21aa1f58 | |
| parent | 2ad4c9564707b3974b52feb363a7ad22bc37b326 (diff) | |
| download | ceilometer-3ed9ed1a0f03dbcc6cad9b3e21664e2380dad62a.tar.gz | |
Use gnocchiclient 4.0 exception types
It does not raise keystoneauth1 exceptions anymore.
Change-Id: I3c544911e63f2ef25ed1c0e7154de054dde02606
| -rw-r--r-- | ceilometer/dispatcher/gnocchi.py | 3 | ||||
| -rw-r--r-- | setup.cfg | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ceilometer/dispatcher/gnocchi.py b/ceilometer/dispatcher/gnocchi.py index c49a527c..8a646584 100644 --- a/ceilometer/dispatcher/gnocchi.py +++ b/ceilometer/dispatcher/gnocchi.py @@ -351,8 +351,7 @@ class GnocchiDispatcher(dispatcher.MeterDispatcherBase, try: self.batch_measures(measures, gnocchi_data, stats) - except (gnocchi_exc.ClientException, - ka_exceptions.ConnectFailure) as e: + except gnocchi_exc.ClientException as e: LOG.error(six.text_type(e)) except Exception as e: LOG.error(six.text_type(e), exc_info=True) @@ -32,7 +32,7 @@ data_files = [extras] gnocchi = - gnocchiclient>=3.1.0 # Apache-2.0 + gnocchiclient>=4.0.0 # Apache-2.0 mongo = pymongo!=3.1,>=3.0.2 # Apache-2.0 postgresql = |