Fix string interpolation in log

This allows the logging package to skip creating the formatted
log message if the message is not going to be emitted because of
the current log level.

Reference:
http://docs.openstack.org/developer/oslo.i18n/guidelines.html

Change-Id: I917a557dd01f84428c0c6f94396bb233cbf1a87e

5 files changed, 11 insertions, 10 deletions

diff --git a/ceilometer/agent/manager.py b/ceilometer/agent/manager.py
index f1d40a04..22737e80 100644
--- a/ceilometer/agent/manager.py
+++ b/ceilometer/agent/manager.py
@@ -303,7 +303,7 @@ class AgentManager(service_base.PipelineBasedService):
             # Extension raising ExtensionLoadError can be ignored,
             # and ignore anything we can't import as a safety measure.
             if isinstance(exc, plugin_base.ExtensionLoadError):
-                LOG.exception(_("Skip loading extension for %s") % ep.name)
+                LOG.exception(_LE("Skip loading extension for %s"), ep.name)
                 return
             if isinstance(exc, ImportError):
                 LOG.error(_("Failed to import extension for %(name)s: "
@@ -506,9 +506,9 @@ class AgentManager(service_base.PipelineBasedService):
                     LOG.error(_LE('Skipping %(name)s, keystone issue: '
                                   '%(exc)s'), {'name': name, 'exc': e})
                 except Exception as err:
-                    LOG.exception(_('Unable to discover resources: %s') % err)
+                    LOG.exception(_LE('Unable to discover resources: %s'), err)
             else:
-                LOG.warning(_('Unknown discovery extension: %s') % name)
+                LOG.warning(_LW('Unknown discovery extension: %s'), name)
         return resources
 
     def stop_pollsters_tasks(self):
diff --git a/ceilometer/api/app.py b/ceilometer/api/app.py
index adde6d16..84fd586a 100644
--- a/ceilometer/api/app.py
+++ b/ceilometer/api/app.py
@@ -105,7 +105,7 @@ def build_server():
     # Create the WSGI server and start it
     host, port = cfg.CONF.api.host, cfg.CONF.api.port
 
-    LOG.info(_LI('Starting server in PID %s') % os.getpid())
+    LOG.info(_LI('Starting server in PID %s'), os.getpid())
     LOG.info(_LI("Configuration:"))
     cfg.CONF.log_opt_values(LOG, log.INFO)
 
diff --git a/ceilometer/publisher/http.py b/ceilometer/publisher/http.py
index 97e942c8..2394ec45 100644
--- a/ceilometer/publisher/http.py
+++ b/ceilometer/publisher/http.py
@@ -111,12 +111,12 @@ class HttpPublisher(publisher.PublisherBase):
         content = ','.join([jsonutils.dumps(item) for item in data])
         content = '[' + content + ']'
 
-        LOG.debug('Data to be posted by HttpPublisher: %s' % content)
+        LOG.debug('Data to be posted by HttpPublisher: %s', content)
 
         res = session.post(self.target, data=content, headers=self.headers,
                            timeout=self.timeout)
         if res.status_code >= 300:
-            LOG.error(_LE('Data post failed with status code %s') %
+            LOG.error(_LE('Data post failed with status code %s'),
                       res.status_code)
 
     def publish_samples(self, samples):
diff --git a/ceilometer/publisher/messaging.py b/ceilometer/publisher/messaging.py
index 2ce7340a..dbf10306 100644
--- a/ceilometer/publisher/messaging.py
+++ b/ceilometer/publisher/messaging.py
@@ -90,10 +90,10 @@ class MessagingPublisher(publisher.PublisherBase):
         self.local_queue = []
 
         if self.policy in ['default', 'queue', 'drop']:
-            LOG.info(_LI('Publishing policy set to %s') % self.policy)
+            LOG.info(_LI('Publishing policy set to %s'), self.policy)
         else:
             LOG.warning(_('Publishing policy is unknown (%s) force to '
-                          'default') % self.policy)
+                          'default'), self.policy)
             self.policy = 'default'
 
         self.retry = 1 if self.policy in ['queue', 'drop'] else None
diff --git a/ceilometer/tests/unit/agent/test_manager.py b/ceilometer/tests/unit/agent/test_manager.py
index 1b34c919..8104047e 100644
--- a/ceilometer/tests/unit/agent/test_manager.py
+++ b/ceilometer/tests/unit/agent/test_manager.py
@@ -116,11 +116,12 @@ class TestManager(base.BaseTestCase):
             manager.AgentManager(namespaces='ipmi',
                                  pollster_list=['hardware.ipmi.node.*'])
         except manager.EmptyPollstersList:
-            err_msg = 'Skip loading extension for hardware.ipmi.node.%s'
+            err_msg = 'Skip loading extension for %s'
             pollster_names = [
                 'power', 'temperature', 'outlet_temperature',
                 'airflow', 'cups', 'cpu_util', 'mem_util', 'io_util']
-            calls = [mock.call(err_msg % n) for n in pollster_names]
+            calls = [mock.call(err_msg, 'hardware.ipmi.node.%s' % n)
+                     for n in pollster_names]
             LOG.exception.assert_has_calls(calls=calls, any_order=True)
 
     # Skip loading pollster upon ImportError