openstack
/
cloudkitty
Code Issues Proposed changes

Delegate log formatting to logging package 

We should delegate (when possible) formatting to the logger in order to
perform formatting only when needed, by using:

 LOG.<level>(message, data)

instead of:

 LOG.<level>(message % data)

Change-Id: I55a949a3908eaef5757815d735de4320645e9764
This commit is contained in:
Cedric Brandily 2015-10-27 12:35:52 +09:00
parent 043dd914dc
commit 7428e4a68b
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloudkitty/api/app.py
View File

@ -112,15 +112,15 @@ def build_server():
# Create the WSGI server and start it
host = CONF.api.host_ip
port = CONF.api.port
LOG.info('Starting server in PID %s' % os.getpid())
LOG.info('Starting server in PID %s', os.getpid())
LOG.info("Configuration:")
cfg.CONF.log_opt_values(LOG, logging.INFO)
if host == '0.0.0.0':
LOG.info('serving on 0.0.0.0:%(sport)s, view at http://127.0.0.1:%'
'(vport)s' % {'sport': port, 'vport': port})
'(vport)s', {'sport': port, 'vport': port})
else:
LOG.info("serving on http://%(host)s:%(port)s" %
LOG.info("serving on http://%(host)s:%(port)s",
{'host': host, 'port': port})
server_cls = simple_server.WSGIServer

12
cloudkitty/orchestrator.py
View File

@ -23,7 +23,6 @@ from oslo_concurrency import lockutils
from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging as messaging
import six
from stevedore import driver
from stevedore import extension
@ -84,20 +83,20 @@ class RatingEndpoint(object):
self._global_reload = True
def reload_module(self, ctxt, name):
LOG.info('Received reload command for module {}.'.format(name))
LOG.info('Received reload command for module %s.', name)
lock = lockutils.lock('module-reload')
with lock:
if name not in self._pending_reload:
self._pending_reload.append(name)
def enable_module(self, ctxt, name):
LOG.info('Received enable command for module {}.'.format(name))
LOG.info('Received enable command for module %s.', name)
lock = lockutils.lock('module-state')
with lock:
self._module_state[name] = True
def disable_module(self, ctxt, name):
LOG.info('Received disable command for module {}.'.format(name))
LOG.info('Received disable command for module %s.', name)
lock = lockutils.lock('module-state')
with lock:
self._module_state[name] = False
@ -187,9 +186,8 @@ class Worker(BaseWorker):
except collector.NoDataCollected:
raise
except Exception as e:
LOG.warn('Error while collecting service {service}:'
' {error}'.format(service=service,
error=six.text_type(e)))
LOG.warn('Error while collecting service %(service)s: '
'%(error)s', {'service': service, 'error': e})
raise collector.NoDataCollected('', service)
except collector.NoDataCollected:
begin = timestamp