From 8e01978eb2a5ee041a1ae894e787a95487a77d7c Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Mon, 5 Jan 2015 02:50:36 +0800 Subject: [PATCH] remove unnecessary str method when log messages In Python 2 environment, if we use str(object) in log message, it will raise UnicodeError. And since we use string format in log messages, the explict str is a bit redundant too. See discussion in dev mailing list: http://lists.openstack.org/pipermail/openstack-dev/2014-June/038857.html See oslo.i18n source code: https://github.com/openstack/oslo.i18n/blob/1.1.0/oslo/i18n/_message.py#L159 Change-Id: Ie9d086a49d56634496a8efbe37ea04f6812e561c Closes-Bug: #1406728 --- ceilometer/agent/plugin_base.py | 2 +- ceilometer/collector.py | 4 ++-- ceilometer/transformer/arithmetic.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ceilometer/agent/plugin_base.py b/ceilometer/agent/plugin_base.py index 902ed3b45..ebc44c5d1 100644 --- a/ceilometer/agent/plugin_base.py +++ b/ceilometer/agent/plugin_base.py @@ -72,7 +72,7 @@ def check_keystone(service_type=None): keystone = _get_keystone() if isinstance(keystone, Exception): LOG.error(_('Skip due to keystone error %s'), - str(keystone) if keystone else '') + keystone if keystone else '') return iter([]) elif service_type: endpoints = keystone.service_catalog.get_endpoints( diff --git a/ceilometer/collector.py b/ceilometer/collector.py index d715f72f7..756b4ee43 100644 --- a/ceilometer/collector.py +++ b/ceilometer/collector.py @@ -99,10 +99,10 @@ class CollectorService(os_service.Service): try: sample = msgpack.loads(data, encoding='utf-8') except Exception: - LOG.warn(_("UDP: Cannot decode data sent by %s"), str(source)) + LOG.warn(_("UDP: Cannot decode data sent by %s"), source) else: try: - LOG.debug(_("UDP: Storing %s"), str(sample)) + LOG.debug(_("UDP: Storing %s"), sample) self.dispatcher_manager.map_method('record_metering_data', sample) except Exception: diff --git a/ceilometer/transformer/arithmetic.py b/ceilometer/transformer/arithmetic.py index 2dbc5c931..37fa692cc 100644 --- a/ceilometer/transformer/arithmetic.py +++ b/ceilometer/transformer/arithmetic.py @@ -93,7 +93,7 @@ class ArithmeticTransformer(transformer.TransformerBase): ) except Exception as e: LOG.warn(_('Unable to evaluate expression %(expr)s: %(exc)s'), - {'expr': self.expr, 'exc': str(e)}) + {'expr': self.expr, 'exc': e}) def handle_sample(self, context, _sample): self._update_cache(_sample)