diff options
| author | Zuul <zuul@review.openstack.org> | 2017-11-30 10:40:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-11-30 10:40:46 +0000 |
| commit | 112a465e0d54398a85e41a52d2441518bccc64ff (patch) | |
| tree | 1d825cf8ad4acb47e6d0531c23c3308d29bd5c9e | |
| parent | e884c1c873068a629f418be1aeffea5828bb4b0a (diff) | |
| parent | 12b3cc63b5b4422926535c7e0d5abfb19f31da53 (diff) | |
| download | ceilometer-112a465e0d54398a85e41a52d2441518bccc64ff.tar.gz | |
Merge "snmp: warn if snmp call timeout" into stable/ocata
| -rw-r--r-- | ceilometer/hardware/pollsters/generic.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ceilometer/hardware/pollsters/generic.py b/ceilometer/hardware/pollsters/generic.py index 647cfca1..1781185e 100644 --- a/ceilometer/hardware/pollsters/generic.py +++ b/ceilometer/hardware/pollsters/generic.py @@ -161,11 +161,15 @@ class GenericHardwareDeclarativePollster(plugin_base.PollsterBase): parsed_url, i_cache[identifier])) except Exception as err: - LOG.exception(_LE('inspector call failed for %(ident)s ' - 'host %(host)s: %(err)s'), - dict(ident=identifier, - host=parsed_url.hostname, - err=err)) + msg = ('inspector call failed for %(ident)s ' + 'host %(host)s: %(err)s' % + dict(ident=identifier, + host=parsed_url.hostname, + err=err)) + if "timeout" in str(err): + LOG.warning(msg) + else: + LOG.exception(msg) return itertools.chain(*sample_iters) def generate_samples(self, host_url, data): |