diff options
Diffstat (limited to 'ceilometer/neutron_client.py')
-rw-r--r-- | ceilometer/neutron_client.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ceilometer/neutron_client.py b/ceilometer/neutron_client.py index 930d7eab..c9751cf1 100644 --- a/ceilometer/neutron_client.py +++ b/ceilometer/neutron_client.py @@ -16,6 +16,7 @@ import functools +from neutronclient.common import exceptions from neutronclient.v2_0 import client as clientv20 from oslo.config import cfg @@ -40,6 +41,10 @@ def logged(func): def with_logging(*args, **kwargs): try: return func(*args, **kwargs) + except exceptions.NeutronClientException as e: + # handles 404's when services are disabled in neutron + LOG.warn(e) + return [] except Exception as e: LOG.exception(e) raise |