openstack/aodh
Code Issues Proposed changes

remove unnecessary str method when log messages

Browse Source 
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
This commit is contained in:
ZhiQiang Fan 2015-01-05 02:50:36 +08:00
parent e5ad0bac86
commit 8e01978eb2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/agent/plugin_base.py
View File

@ -72,7 +72,7 @@ def check_keystone(service_type=None):
keystone = _get_keystone() keystone = _get_keystone()
if isinstance(keystone, Exception): if isinstance(keystone, Exception):
LOG.error(_('Skip due to keystone error %s'), LOG.error(_('Skip due to keystone error %s'),
str(keystone) if keystone else '') keystone if keystone else '')
return iter([]) return iter([])
elif service_type: elif service_type:
endpoints = keystone.service_catalog.get_endpoints( endpoints = keystone.service_catalog.get_endpoints(

4
ceilometer/collector.py
View File

@ -99,10 +99,10 @@ class CollectorService(os_service.Service):
try: try:
sample = msgpack.loads(data, encoding='utf-8') sample = msgpack.loads(data, encoding='utf-8')
except Exception: except Exception:
LOG.warn(_("UDP: Cannot decode data sent by %s"), str(source)) LOG.warn(_("UDP: Cannot decode data sent by %s"), source)
else: else:
try: try:
LOG.debug(_("UDP: Storing %s"), str(sample)) LOG.debug(_("UDP: Storing %s"), sample)
self.dispatcher_manager.map_method('record_metering_data', self.dispatcher_manager.map_method('record_metering_data',
sample) sample)
except Exception: except Exception:

2
ceilometer/transformer/arithmetic.py
View File

@ -93,7 +93,7 @@ class ArithmeticTransformer(transformer.TransformerBase):
) )
except Exception as e: except Exception as e:
LOG.warn(_('Unable to evaluate expression %(expr)s: %(exc)s'), 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): def handle_sample(self, context, _sample):
self._update_cache(_sample) self._update_cache(_sample)