Merge "Don't translate debug level logs in nova.objects"

This commit is contained in:
Jenkins
2014-05-05 17:16:32 +00:00
committed by Gerrit Code Review
4 changed files with 4 additions and 4 deletions
+1
View File
@@ -213,6 +213,7 @@ def no_translate_debug_logs(logical_line, filename):
"nova/cells",
"nova/conductor",
"nova/compute",
"nova/objects",
]
if max([name in filename for name in dirs]):
if logical_line.startswith("LOG.debug(_("):
+1 -1
View File
@@ -162,7 +162,7 @@ class BlockDeviceMapping(base.NovaPersistentObject, base.NovaObject):
raise exception.OrphanedObjectError(method='obj_load_attr',
objtype=self.obj_name())
LOG.debug(_("Lazy-loading `%(attr)s' on %(name)s uuid %(uuid)s"),
LOG.debug("Lazy-loading `%(attr)s' on %(name)s uuid %(uuid)s",
{'attr': attrname,
'name': self.obj_name(),
'uuid': self.uuid,
+1 -1
View File
@@ -513,7 +513,7 @@ class Instance(base.NovaPersistentObject, base.NovaObject):
raise exception.OrphanedObjectError(method='obj_load_attr',
objtype=self.obj_name())
LOG.debug(_("Lazy-loading `%(attr)s' on %(name)s uuid %(uuid)s"),
LOG.debug("Lazy-loading `%(attr)s' on %(name)s uuid %(uuid)s",
{'attr': attrname,
'name': self.obj_name(),
'uuid': self.uuid,
+1 -2
View File
@@ -18,7 +18,6 @@ from nova import exception
from nova.objects import base
from nova.objects import compute_node
from nova.objects import fields
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging
@@ -73,7 +72,7 @@ class Service(base.NovaPersistentObject, base.NovaObject):
if not self._context:
raise exception.OrphanedObjectError(method='obj_load_attr',
objtype=self.obj_name())
LOG.debug(_("Lazy-loading `%(attr)s' on %(name)s id %(id)s"),
LOG.debug("Lazy-loading `%(attr)s' on %(name)s id %(id)s",
{'attr': attrname,
'name': self.obj_name(),
'id': self.id,