Use international logging message
Change-Id: Id66b48e9f31873abefaa71b822292697f097492f
This commit is contained in:
parent
e694992818
commit
56883998e6
|
@ -26,6 +26,7 @@ import pecan
|
||||||
|
|
||||||
from cloudkitty.api import config as api_config
|
from cloudkitty.api import config as api_config
|
||||||
from cloudkitty.api import hooks
|
from cloudkitty.api import hooks
|
||||||
|
from cloudkitty.i18n import _LI
|
||||||
from cloudkitty import rpc
|
from cloudkitty import rpc
|
||||||
from cloudkitty import storage
|
from cloudkitty import storage
|
||||||
|
|
||||||
|
@ -106,7 +107,7 @@ def load_app():
|
||||||
|
|
||||||
if not cfg_file:
|
if not cfg_file:
|
||||||
raise cfg.ConfigFilesNotFoundError([cfg.CONF.api_paste_config])
|
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)
|
return deploy.loadapp("config:" + cfg_file)
|
||||||
|
|
||||||
|
|
||||||
|
@ -114,15 +115,16 @@ def build_server():
|
||||||
# Create the WSGI server and start it
|
# Create the WSGI server and start it
|
||||||
host = CONF.api.host_ip
|
host = CONF.api.host_ip
|
||||||
port = CONF.api.port
|
port = CONF.api.port
|
||||||
LOG.info('Starting server in PID %s', os.getpid())
|
LOG.info(_LI('Starting server in PID %s'), os.getpid())
|
||||||
LOG.info("Configuration:")
|
LOG.info(_LI("Configuration:"))
|
||||||
cfg.CONF.log_opt_values(LOG, logging.INFO)
|
cfg.CONF.log_opt_values(LOG, logging.INFO)
|
||||||
|
|
||||||
if host == '0.0.0.0':
|
if host == '0.0.0.0':
|
||||||
LOG.info('serving on 0.0.0.0:%(sport)s, view at http://127.0.0.1:%'
|
LOG.info(_LI('serving on 0.0.0.0:%(sport)s, view at '
|
||||||
'(vport)s', {'sport': port, 'vport': port})
|
'http://127.0.0.1:%(vport)s'),
|
||||||
|
{'sport': port, 'vport': port})
|
||||||
else:
|
else:
|
||||||
LOG.info("serving on http://%(host)s:%(port)s",
|
LOG.info(_LI("serving on http://%(host)s:%(port)s"),
|
||||||
{'host': host, 'port': port})
|
{'host': host, 'port': port})
|
||||||
|
|
||||||
server_cls = simple_server.WSGIServer
|
server_cls = simple_server.WSGIServer
|
||||||
|
|
|
@ -32,6 +32,7 @@ from cloudkitty import collector
|
||||||
from cloudkitty.common import rpc
|
from cloudkitty.common import rpc
|
||||||
from cloudkitty import config # noqa
|
from cloudkitty import config # noqa
|
||||||
from cloudkitty import extension_manager
|
from cloudkitty import extension_manager
|
||||||
|
from cloudkitty.i18n import _LI, _LW
|
||||||
from cloudkitty import storage
|
from cloudkitty import storage
|
||||||
from cloudkitty import transformer
|
from cloudkitty import transformer
|
||||||
from cloudkitty import utils as ck_utils
|
from cloudkitty import utils as ck_utils
|
||||||
|
@ -85,26 +86,26 @@ class RatingEndpoint(object):
|
||||||
return str(worker.quote(res_data))
|
return str(worker.quote(res_data))
|
||||||
|
|
||||||
def reload_modules(self, ctxt):
|
def reload_modules(self, ctxt):
|
||||||
LOG.info('Received reload modules command.')
|
LOG.info(_LI('Received reload modules command.'))
|
||||||
lock = lockutils.lock('module-reload')
|
lock = lockutils.lock('module-reload')
|
||||||
with lock:
|
with lock:
|
||||||
self._global_reload = True
|
self._global_reload = True
|
||||||
|
|
||||||
def reload_module(self, ctxt, name):
|
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')
|
lock = lockutils.lock('module-reload')
|
||||||
with lock:
|
with lock:
|
||||||
if name not in self._pending_reload:
|
if name not in self._pending_reload:
|
||||||
self._pending_reload.append(name)
|
self._pending_reload.append(name)
|
||||||
|
|
||||||
def enable_module(self, ctxt, 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')
|
lock = lockutils.lock('module-state')
|
||||||
with lock:
|
with lock:
|
||||||
self._module_state[name] = True
|
self._module_state[name] = True
|
||||||
|
|
||||||
def disable_module(self, ctxt, name):
|
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')
|
lock = lockutils.lock('module-state')
|
||||||
with lock:
|
with lock:
|
||||||
self._module_state[name] = False
|
self._module_state[name] = False
|
||||||
|
@ -195,8 +196,9 @@ class Worker(BaseWorker):
|
||||||
raise
|
raise
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.warning(
|
LOG.warning(
|
||||||
'Error while collecting service %(service)s: '
|
_LW('Error while collecting service '
|
||||||
'%(error)s', {'service': service, 'error': e})
|
'%(service)s: %(error)s'),
|
||||||
|
{'service': service, 'error': e})
|
||||||
raise collector.NoDataCollected('', service)
|
raise collector.NoDataCollected('', service)
|
||||||
except collector.NoDataCollected:
|
except collector.NoDataCollected:
|
||||||
begin = timestamp
|
begin = timestamp
|
||||||
|
|
|
@ -19,6 +19,7 @@ import decimal
|
||||||
|
|
||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
|
|
||||||
|
from cloudkitty.i18n import _LW
|
||||||
from cloudkitty.storage.gnocchi_hybrid import migration
|
from cloudkitty.storage.gnocchi_hybrid import migration
|
||||||
from cloudkitty.storage.gnocchi_hybrid import models
|
from cloudkitty.storage.gnocchi_hybrid import models
|
||||||
from cloudkitty.storage import sqlalchemy as sql_storage
|
from cloudkitty.storage import sqlalchemy as sql_storage
|
||||||
|
@ -48,9 +49,9 @@ class GnocchiHybridStorage(sql_storage.SQLAlchemyStorage):
|
||||||
else:
|
else:
|
||||||
resource_ref = frame.get('resource_id')
|
resource_ref = frame.get('resource_id')
|
||||||
if not resource_ref:
|
if not resource_ref:
|
||||||
LOG.warn('Trying to store data collected outside of gnocchi. '
|
LOG.warn(_LW('Trying to store data collected outside of '
|
||||||
'This driver can only be used with the gnocchi collector.'
|
'gnocchi. This driver can only be used with '
|
||||||
' Data not stored!')
|
'the gnocchi collector. Data not stored!'))
|
||||||
return
|
return
|
||||||
self.add_time_frame(begin=self.usage_start_dt.get(tenant_id),
|
self.add_time_frame(begin=self.usage_start_dt.get(tenant_id),
|
||||||
end=self.usage_end_dt.get(tenant_id),
|
end=self.usage_end_dt.get(tenant_id),
|
||||||
|
|
Loading…
Reference in New Issue