openstack/deb-ceilometer
Code Issues Proposed changes

Simplify chained comparison

Browse Source 
"x < y and y <= z" is equivalent to "x < y <= z"

Change-Id: I3386ce5dc46335bc693b696ba42b4c076ff142a5
This commit is contained in:
Eyal 2016-04-04 16:37:43 +03:00
parent 4c491b52e2
commit 8ee9fc1f7d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceilometer/ipmi/pollsters/node.py
View File

@ -66,8 +66,7 @@ class _Base(plugin_base.PollsterBase):
LOG.warning(_('Polling %(name)s failed for %(cnt)s times!') LOG.warning(_('Polling %(name)s failed for %(cnt)s times!')
% ({'name': self.NAME, % ({'name': self.NAME,
'cnt': self.polling_failures})) 'cnt': self.polling_failures}))
if (CONF.ipmi.polling_retry >= 0 and if 0 <= CONF.ipmi.polling_retry < self.polling_failures:
self.polling_failures > CONF.ipmi.polling_retry):
LOG.warning(_('Pollster for %s is disabled!') % self.NAME) LOG.warning(_('Pollster for %s is disabled!') % self.NAME)
raise plugin_base.PollsterPermanentError(resources) raise plugin_base.PollsterPermanentError(resources)
else: else:

3
ceilometer/ipmi/pollsters/sensor.py
View File

@ -69,8 +69,7 @@ class SensorPollster(plugin_base.PollsterBase):
'Polling %(mtr)s sensor failed for %(cnt)s times!') 'Polling %(mtr)s sensor failed for %(cnt)s times!')
% ({'mtr': self.METRIC, % ({'mtr': self.METRIC,
'cnt': self.polling_failures})) 'cnt': self.polling_failures}))
if (CONF.ipmi.polling_retry >= 0 and if 0 <= CONF.ipmi.polling_retry < self.polling_failures:
self.polling_failures > CONF.ipmi.polling_retry):
LOG.warning(_('Pollster for %s is disabled!') % self.METRIC) LOG.warning(_('Pollster for %s is disabled!') % self.METRIC)
raise plugin_base.PollsterPermanentError(resources) raise plugin_base.PollsterPermanentError(resources)
else: else: