diff --git a/ceilometer/compute/pollsters/cpu.py b/ceilometer/compute/pollsters/cpu.py index f0ee34f71..c3ebba418 100644 --- a/ceilometer/compute/pollsters/cpu.py +++ b/ceilometer/compute/pollsters/cpu.py @@ -56,9 +56,8 @@ class CPUPollster(plugin.ComputePollster): LOG.debug(_('Obtaining CPU time is not implemented for %s' ), manager.inspector.__class__.__name__) except Exception as err: - LOG.error(_('could not get CPU time for %(id)s: %(e)s') % ( - {'id': instance.id, 'e': err})) - LOG.exception(err) + LOG.exception(_('could not get CPU time for %(id)s: %(e)s'), + {'id': instance.id, 'e': err}) class CPUUtilPollster(plugin.ComputePollster): @@ -85,8 +84,8 @@ class CPUUtilPollster(plugin.ComputePollster): LOG.debug(_('Exception while getting samples %s'), err) except NotImplementedError: # Selected inspector does not implement this pollster. - LOG.debug(_('Obtaining CPU Util is not implemented for %s' - ), manager.inspector.__class__.__name__) + LOG.debug(_('Obtaining CPU Util is not implemented for %s'), + manager.inspector.__class__.__name__) except Exception as err: - LOG.error(_('Could not get CPU Util for %(id)s: %(e)s'), ( - {'id': instance.id, 'e': err})) + LOG.exception(_('Could not get CPU Util for %(id)s: %(e)s'), + {'id': instance.id, 'e': err}) diff --git a/ceilometer/compute/pollsters/disk.py b/ceilometer/compute/pollsters/disk.py index c6f9f776b..b0c2c0426 100644 --- a/ceilometer/compute/pollsters/disk.py +++ b/ceilometer/compute/pollsters/disk.py @@ -98,13 +98,12 @@ class _Base(plugin.ComputePollster): except NotImplementedError: # Selected inspector does not implement this pollster. LOG.debug(_('%(inspector)s does not provide data for ' - ' %(pollster)s'), ({ - 'inspector': manager.inspector.__class__.__name__, - 'pollster': self.__class__.__name__})) + ' %(pollster)s'), + {'inspector': manager.inspector.__class__.__name__, + 'pollster': self.__class__.__name__}) except Exception as err: - LOG.warning(_('Ignoring instance %(name)s: %(error)s') % ( - {'name': instance_name, 'error': err})) - LOG.exception(err) + LOG.exception(_('Ignoring instance %(name)s: %(error)s'), + {'name': instance_name, 'error': err}) class ReadRequestsPollster(_Base): @@ -206,13 +205,13 @@ class _DiskRatesPollsterBase(plugin.ComputePollster): except NotImplementedError: # Selected inspector does not implement this pollster. LOG.debug(_('%(inspector)s does not provide data for ' - ' %(pollster)s'), ({ - 'inspector': manager.inspector.__class__.__name__, - 'pollster': self.__class__.__name__})) + ' %(pollster)s'), + {'inspector': manager.inspector.__class__.__name__, + 'pollster': self.__class__.__name__}) except Exception as err: instance_name = util.instance_name(instance) - LOG.error(_('Ignoring instance %(name)s: %(error)s') % ( - {'name': instance_name, 'error': err})) + LOG.exception(_('Ignoring instance %(name)s: %(error)s'), + {'name': instance_name, 'error': err}) class ReadBytesRatePollster(_DiskRatesPollsterBase): diff --git a/ceilometer/compute/pollsters/memory.py b/ceilometer/compute/pollsters/memory.py index 43850a72e..9781bb71b 100644 --- a/ceilometer/compute/pollsters/memory.py +++ b/ceilometer/compute/pollsters/memory.py @@ -50,5 +50,6 @@ class MemoryUsagePollster(plugin.ComputePollster): LOG.debug(_('Obtaining Memory Usage is not implemented for %s' ), manager.inspector.__class__.__name__) except Exception as err: - LOG.error(_('Could not get Memory Usage for %(id)s: %(e)s'), ( - {'id': instance.id, 'e': err})) + LOG.exception(_('Could not get Memory Usage for ' + '%(id)s: %(e)s'), {'id': instance.id, + 'e': err}) diff --git a/ceilometer/compute/pollsters/net.py b/ceilometer/compute/pollsters/net.py index 5eae80dee..a75d56b0f 100644 --- a/ceilometer/compute/pollsters/net.py +++ b/ceilometer/compute/pollsters/net.py @@ -68,10 +68,12 @@ class _Base(plugin.ComputePollster): instance_name = util.instance_name(instance) return inspector.inspect_vnics(instance_name) - def _get_rx_info(self, info): + @staticmethod + def _get_rx_info(info): return info.rx_bytes - def _get_tx_info(self, info): + @staticmethod + def _get_tx_info(info): return info.tx_bytes def _get_vnics_for_instance(self, cache, inspector, instance): @@ -105,13 +107,12 @@ class _Base(plugin.ComputePollster): except NotImplementedError: # Selected inspector does not implement this pollster. LOG.debug(_('%(inspector)s does not provide data for ' - ' %(pollster)s'), ({ - 'inspector': manager.inspector.__class__.__name__, - 'pollster': self.__class__.__name__})) + ' %(pollster)s'), + {'inspector': manager.inspector.__class__.__name__, + 'pollster': self.__class__.__name__}) except Exception as err: - LOG.warning(_('Ignoring instance %(name)s: %(error)s') % ( - {'name': instance_name, 'error': err})) - LOG.exception(err) + LOG.exception(_('Ignoring instance %(name)s: %(error)s'), + {'name': instance_name, 'error': err}) class _RateBase(_Base): @@ -126,10 +127,12 @@ class _RateBase(_Base): return inspector.inspect_vnic_rates(instance, self._inspection_duration) - def _get_rx_info(self, info): + @staticmethod + def _get_rx_info(info): return info.rx_bytes_rate - def _get_tx_info(self, info): + @staticmethod + def _get_tx_info(info): return info.tx_bytes_rate