openstack
/
cloudkitty
Code Issues Proposed changes

Use international logging message 

Change-Id: Id66b48e9f31873abefaa71b822292697f097492f
This commit is contained in:
liujiong 2016-08-08 23:21:50 +08:00
parent e694992818
commit 56883998e6
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cloudkitty/api/app.py
View File

@ -26,6 +26,7 @@ import pecan
from cloudkitty.api import config as api_config
from cloudkitty.api import hooks
from cloudkitty.i18n import _LI
from cloudkitty import rpc
from cloudkitty import storage
@ -106,7 +107,7 @@ def load_app():
if not cfg_file:
raise cfg.ConfigFilesNotFoundError([cfg.CONF.api_paste_config])
LOG.info("Full WSGI config used: %s" % cfg_file)
LOG.info(_LI("Full WSGI config used: %s") % cfg_file)
return deploy.loadapp("config:" + cfg_file)
@ -114,15 +115,16 @@ 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("Configuration:")
LOG.info(_LI('Starting server in PID %s'), os.getpid())
LOG.info(_LI("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})
LOG.info(_LI('serving on 0.0.0.0:%(sport)s, view at '
'http://127.0.0.1:%(vport)s'),
{'sport': port, 'vport': port})
else:
LOG.info("serving on http://%(host)s:%(port)s",
LOG.info(_LI("serving on http://%(host)s:%(port)s"),
{'host': host, 'port': port})
server_cls = simple_server.WSGIServer

14
cloudkitty/orchestrator.py
View File

@ -32,6 +32,7 @@ from cloudkitty import collector
from cloudkitty.common import rpc
from cloudkitty import config # noqa
from cloudkitty import extension_manager
from cloudkitty.i18n import _LI, _LW
from cloudkitty import storage
from cloudkitty import transformer
from cloudkitty import utils as ck_utils
@ -85,26 +86,26 @@ class RatingEndpoint(object):
return str(worker.quote(res_data))
def reload_modules(self, ctxt):
LOG.info('Received reload modules command.')
LOG.info(_LI('Received reload modules command.'))
lock = lockutils.lock('module-reload')
with lock:
self._global_reload = True
def reload_module(self, ctxt, name):
LOG.info('Received reload command for module %s.', name)
LOG.info(_LI('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 %s.', name)
LOG.info(_LI('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 %s.', name)
LOG.info(_LI('Received disable command for module %s.'), name)
lock = lockutils.lock('module-state')
with lock:
self._module_state[name] = False
@ -195,8 +196,9 @@ class Worker(BaseWorker):
raise
except Exception as e:
LOG.warning(
'Error while collecting service %(service)s: '
'%(error)s', {'service': service, 'error': e})
_LW('Error while collecting service '
'%(service)s: %(error)s'),
{'service': service, 'error': e})
raise collector.NoDataCollected('', service)
except collector.NoDataCollected:
begin = timestamp

7
cloudkitty/storage/gnocchi_hybrid/__init__.py
View File

@ -19,6 +19,7 @@ import decimal
from oslo_log import log
from cloudkitty.i18n import _LW
from cloudkitty.storage.gnocchi_hybrid import migration
from cloudkitty.storage.gnocchi_hybrid import models
from cloudkitty.storage import sqlalchemy as sql_storage
@ -48,9 +49,9 @@ class GnocchiHybridStorage(sql_storage.SQLAlchemyStorage):
else:
resource_ref = frame.get('resource_id')
if not resource_ref:
LOG.warn('Trying to store data collected outside of gnocchi. '
'This driver can only be used with the gnocchi collector.'
' Data not stored!')
LOG.warn(_LW('Trying to store data collected outside of '
'gnocchi. This driver can only be used with '
'the gnocchi collector. Data not stored!'))
return
self.add_time_frame(begin=self.usage_start_dt.get(tenant_id),
end=self.usage_end_dt.get(tenant_id),