Use proper international logging message
Change-Id: I1c16a77fd3efeb40341fe891fa2429fe7f0286af
This commit is contained in:
liujiong
parent
8907676300
commit
74775fa5c2
@ -23,6 +23,7 @@ import pecan
|
||||
|
||||
from aodh.api import hooks
|
||||
from aodh.api import middleware
|
||||
from aodh.i18n import _LI
|
||||
from aodh import service
|
||||
from aodh import storage
|
||||
|
||||
@ -70,7 +71,7 @@ def load_app(conf):
|
||||
|
||||
if not cfg_file:
|
||||
raise cfg.ConfigFilesNotFoundError([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)
|
||||
|
||||
|
||||
|
||||
@ -43,7 +43,7 @@ from aodh.api.controllers.v2.alarm_rules import combination
|
||||
from aodh.api.controllers.v2 import base
|
||||
from aodh.api.controllers.v2 import utils as v2_utils
|
||||
from aodh.api import rbac
|
||||
from aodh.i18n import _
|
||||
from aodh.i18n import _, _LI, _LE
|
||||
from aodh import keystone_client
|
||||
from aodh import messaging
|
||||
from aodh import notifier
|
||||
@ -321,8 +321,8 @@ class Alarm(base.Base):
|
||||
|
||||
action_set = set(actions)
|
||||
if len(actions) != len(action_set):
|
||||
LOG.info(_('duplicate actions are found: %s, '
|
||||
'remove duplicate ones') % actions)
|
||||
LOG.info(_LI('duplicate actions are found: %s, '
|
||||
'remove duplicate ones'), actions)
|
||||
actions = list(action_set)
|
||||
setattr(alarm, actions_name, actions)
|
||||
|
||||
@ -604,7 +604,7 @@ class AlarmController(rest.RestController):
|
||||
try:
|
||||
alarm_in = models.Alarm(**updated_alarm)
|
||||
except Exception:
|
||||
LOG.exception(_("Error while putting alarm: %s") % updated_alarm)
|
||||
LOG.exception(_LE("Error while putting alarm: %s"), updated_alarm)
|
||||
raise base.ClientSideError(_("Alarm incorrect"))
|
||||
|
||||
alarm = pecan.request.storage.update_alarm(alarm_in)
|
||||
@ -767,7 +767,7 @@ class AlarmsController(rest.RestController):
|
||||
try:
|
||||
alarm_in = models.Alarm(**change)
|
||||
except Exception:
|
||||
LOG.exception(_("Error while posting alarm: %s") % change)
|
||||
LOG.exception(_LE("Error while posting alarm: %s"), change)
|
||||
raise base.ClientSideError(_("Alarm incorrect"))
|
||||
|
||||
alarm = conn.create_alarm(alarm_in)
|
||||
|
||||
@ -31,7 +31,7 @@ import wsmeext.pecan as wsme_pecan
|
||||
from aodh.api.controllers.v2 import alarms
|
||||
from aodh.api.controllers.v2 import base
|
||||
from aodh.api import rbac
|
||||
from aodh.i18n import _
|
||||
from aodh.i18n import _, _LE
|
||||
from aodh.storage import models
|
||||
|
||||
LOG = log.getLogger(__name__)
|
||||
@ -330,7 +330,7 @@ class ValidatedComplexQuery(object):
|
||||
date_time = date_time.replace(tzinfo=None)
|
||||
return date_time
|
||||
except ValueError:
|
||||
LOG.exception(_("String %s is not a valid isotime") % isotime)
|
||||
LOG.exception(_LE("String %s is not a valid isotime"), isotime)
|
||||
msg = _('Failed to parse the timestamp value %s') % isotime
|
||||
raise base.ClientSideError(msg)
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ import six
|
||||
import webob
|
||||
|
||||
from aodh import i18n
|
||||
from aodh.i18n import _
|
||||
from aodh.i18n import _LE
|
||||
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
@ -99,7 +99,7 @@ class ParsableErrorMiddleware(object):
|
||||
error_message,
|
||||
b'</error_message>'))
|
||||
except etree.XMLSyntaxError as err:
|
||||
LOG.error(_('Error parsing HTTP response: %s'), err)
|
||||
LOG.error(_LE('Error parsing HTTP response: %s'), err)
|
||||
error_message = state['status_code']
|
||||
body = '<error_message>%s</error_message>' % error_message
|
||||
if six.PY3:
|
||||
|
||||
@ -33,7 +33,7 @@ import uuid
|
||||
|
||||
import aodh
|
||||
from aodh import coordination
|
||||
from aodh.i18n import _, _LW
|
||||
from aodh.i18n import _LI, _LE, _LW
|
||||
from aodh import keystone_client
|
||||
from aodh import messaging
|
||||
from aodh import queue
|
||||
@ -114,10 +114,10 @@ class Evaluator(object):
|
||||
previous = alarm.state
|
||||
alarm.state = state
|
||||
if previous != state or always_record:
|
||||
LOG.info(_('alarm %(id)s transitioning to %(state)s because '
|
||||
'%(reason)s') % {'id': alarm.alarm_id,
|
||||
'state': state,
|
||||
'reason': reason})
|
||||
LOG.info(_LI('alarm %(id)s transitioning to %(state)s because '
|
||||
'%(reason)s'), {'id': alarm.alarm_id,
|
||||
'state': state,
|
||||
'reason': reason})
|
||||
try:
|
||||
self._storage_conn.update_alarm(alarm)
|
||||
except storage.AlarmNotFound:
|
||||
@ -132,7 +132,7 @@ class Evaluator(object):
|
||||
except Exception:
|
||||
# retry will occur naturally on the next evaluation
|
||||
# cycle (unless alarm state reverts in the meantime)
|
||||
LOG.exception(_('alarm state update failed'))
|
||||
LOG.exception(_LE('alarm state update failed'))
|
||||
|
||||
@classmethod
|
||||
def within_time_constraint(cls, alarm):
|
||||
@ -241,12 +241,12 @@ class AlarmEvaluationService(cotyledon.Service):
|
||||
def _evaluate_assigned_alarms(self):
|
||||
try:
|
||||
alarms = self._assigned_alarms()
|
||||
LOG.info(_('initiating evaluation cycle on %d alarms') %
|
||||
LOG.info(_LI('initiating evaluation cycle on %d alarms'),
|
||||
len(alarms))
|
||||
for alarm in alarms:
|
||||
self._evaluate_alarm(alarm)
|
||||
except Exception:
|
||||
LOG.exception(_('alarm evaluation cycle failed'))
|
||||
LOG.exception(_LE('alarm evaluation cycle failed'))
|
||||
|
||||
def _evaluate_alarm(self, alarm):
|
||||
"""Evaluate the alarms assigned to this evaluator."""
|
||||
@ -258,7 +258,7 @@ class AlarmEvaluationService(cotyledon.Service):
|
||||
try:
|
||||
self.evaluators[alarm.type].obj.evaluate(alarm)
|
||||
except Exception:
|
||||
LOG.exception(_('Failed to evaluate alarm %s'), alarm.alarm_id)
|
||||
LOG.exception(_LE('Failed to evaluate alarm %s'), alarm.alarm_id)
|
||||
|
||||
def _assigned_alarms(self):
|
||||
# NOTE(r-mibu): The 'event' type alarms will be evaluated by the
|
||||
|
||||
@ -23,7 +23,7 @@ from oslo_utils import netutils
|
||||
import pymongo
|
||||
import retrying
|
||||
|
||||
from aodh.i18n import _
|
||||
from aodh.i18n import _LI, _LW
|
||||
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
@ -74,7 +74,7 @@ class ConnectionPool(object):
|
||||
splitted_url = netutils.urlsplit(url)
|
||||
log_data = {'db': splitted_url.scheme,
|
||||
'nodelist': connection_options['nodelist']}
|
||||
LOG.info(_('Connecting to %(db)s on %(nodelist)s') % log_data)
|
||||
LOG.info(_LI('Connecting to %(db)s on %(nodelist)s'), log_data)
|
||||
try:
|
||||
client = MongoProxy(
|
||||
pymongo.MongoClient(url),
|
||||
@ -82,8 +82,8 @@ class ConnectionPool(object):
|
||||
retry_interval,
|
||||
)
|
||||
except pymongo.errors.ConnectionFailure as e:
|
||||
LOG.warning(_('Unable to connect to the database server: '
|
||||
'%(errmsg)s.') % {'errmsg': e})
|
||||
LOG.warning(_LW('Unable to connect to the database server: '
|
||||
'%(errmsg)s.'), {'errmsg': e})
|
||||
raise
|
||||
self._pool[pool_key] = weakref.ref(client)
|
||||
return client
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user