summaryrefslogtreecommitdiff
path: root/ceilometer/event
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-07 13:30:48 +0000
committerGerrit Code Review <review@openstack.org>2016-11-07 13:30:48 +0000
commit661ac98bbce9dc5fda85253c2260427291b079a5 (patch)
tree5dffc244e8462b030551cf89a633d3801061ab49 /ceilometer/event
parent4a0f6432441cda8f08486dc0788f60b04b92bec1 (diff)
parentaf53f31ec4d9b08c264d90a1d3f092f7f5dedc67 (diff)
downloadceilometer-661ac98bbce9dc5fda85253c2260427291b079a5.tar.gz
Merge "Modify variable's using method in Log Messages"
Diffstat (limited to 'ceilometer/event')
-rw-r--r--ceilometer/event/storage/impl_elasticsearch.py6
-rw-r--r--ceilometer/event/storage/impl_sqlalchemy.py6
2 files changed, 6 insertions, 6 deletions
diff --git a/ceilometer/event/storage/impl_elasticsearch.py b/ceilometer/event/storage/impl_elasticsearch.py
index ab7ee867..4703fc66 100644
--- a/ceilometer/event/storage/impl_elasticsearch.py
+++ b/ceilometer/event/storage/impl_elasticsearch.py
@@ -104,10 +104,10 @@ class Connection(base.Connection):
if not ok:
__, result = result.popitem()
if result['status'] == 409:
- LOG.info(_LI('Duplicate event detected, skipping it: %s')
- % result)
+ LOG.info(_LI('Duplicate event detected, skipping it: %s'),
+ result)
else:
- LOG.exception(_LE('Failed to record event: %s') % result)
+ LOG.exception(_LE('Failed to record event: %s'), result)
error = storage.StorageUnknownWriteError(result)
if self._refresh_on_write:
diff --git a/ceilometer/event/storage/impl_sqlalchemy.py b/ceilometer/event/storage/impl_sqlalchemy.py
index 0a350188..119efa19 100644
--- a/ceilometer/event/storage/impl_sqlalchemy.py
+++ b/ceilometer/event/storage/impl_sqlalchemy.py
@@ -215,11 +215,11 @@ class Connection(base.Connection):
session.execute(model.__table__.insert(),
trait_map[dtype])
except dbexc.DBDuplicateEntry as e:
- LOG.info(_LI("Duplicate event detected, skipping it: %s") % e)
+ LOG.info(_LI("Duplicate event detected, skipping it: %s"), e)
except KeyError as e:
- LOG.exception(_LE('Failed to record event: %s') % e)
+ LOG.exception(_LE('Failed to record event: %s'), e)
except Exception as e:
- LOG.exception(_LE('Failed to record event: %s') % e)
+ LOG.exception(_LE('Failed to record event: %s'), e)
error = e
if error:
raise error