diff options
| author | Eyal <eyal.bar-ilan@nokia.com> | 2016-04-04 16:37:43 +0300 |
|---|---|---|
| committer | Eyal <eyal.bar-ilan@nokia.com> | 2016-04-04 16:37:43 +0300 |
| commit | 8ee9fc1f7dd80ecc052b4e6f7591612964970610 (patch) | |
| tree | c45e3a9f372651ad1f58d12be13752cc6609c1bb /ceilometer/ipmi | |
| parent | 4c491b52e2eb31c4c7534cf336b443b7060ffa13 (diff) | |
| download | ceilometer-8ee9fc1f7dd80ecc052b4e6f7591612964970610.tar.gz | |
Simplify chained comparison
"x < y and y <= z" is equivalent to "x < y <= z"
Change-Id: I3386ce5dc46335bc693b696ba42b4c076ff142a5
Diffstat (limited to 'ceilometer/ipmi')
| -rw-r--r-- | ceilometer/ipmi/pollsters/node.py | 3 | ||||
| -rw-r--r-- | ceilometer/ipmi/pollsters/sensor.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ceilometer/ipmi/pollsters/node.py b/ceilometer/ipmi/pollsters/node.py index 9fb17859..57cdcd3d 100644 --- a/ceilometer/ipmi/pollsters/node.py +++ b/ceilometer/ipmi/pollsters/node.py @@ -66,8 +66,7 @@ class _Base(plugin_base.PollsterBase): LOG.warning(_('Polling %(name)s failed for %(cnt)s times!') % ({'name': self.NAME, 'cnt': self.polling_failures})) - if (CONF.ipmi.polling_retry >= 0 and - self.polling_failures > CONF.ipmi.polling_retry): + if 0 <= CONF.ipmi.polling_retry < self.polling_failures: LOG.warning(_('Pollster for %s is disabled!') % self.NAME) raise plugin_base.PollsterPermanentError(resources) else: diff --git a/ceilometer/ipmi/pollsters/sensor.py b/ceilometer/ipmi/pollsters/sensor.py index 053e9663..01963965 100644 --- a/ceilometer/ipmi/pollsters/sensor.py +++ b/ceilometer/ipmi/pollsters/sensor.py @@ -69,8 +69,7 @@ class SensorPollster(plugin_base.PollsterBase): 'Polling %(mtr)s sensor failed for %(cnt)s times!') % ({'mtr': self.METRIC, 'cnt': self.polling_failures})) - if (CONF.ipmi.polling_retry >= 0 and - self.polling_failures > CONF.ipmi.polling_retry): + if 0 <= CONF.ipmi.polling_retry < self.polling_failures: LOG.warning(_('Pollster for %s is disabled!') % self.METRIC) raise plugin_base.PollsterPermanentError(resources) else: |