openstack/nova
Code Issues Proposed changes

Cleanup log lines in nova.image.glance

Browse Source 
These were inconsistent, occassionally had the wrong translation
marker, and sometimes were substituting variables incorrectly.
No functional changes, just a cleanup.

Change-Id: I05578f497fc863ad453bba277072b8e4893006bf
This commit is contained in:
Michael Still
2015-06-30 09:16:26 +10:00
parent 6a24bbeecd
commit ce910bc92e
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
nova/image/glance.py
View File

@@ -37,7 +37,7 @@ from six.moves import range
import six.moves.urllib.parse as urlparse
from nova import exception
from nova.i18n import _, _LE, _LW
from nova.i18n import _LE, _LI, _LW
import nova.image.download as image_xfers
@@ -236,12 +236,11 @@ class GlanceClientWrapper(object):
else:
extra = 'done trying'
error_msg = (_("Error contacting glance server "
"'%(host)s:%(port)s' for '%(method)s', "
"%(extra)s.") %
{'host': host, 'port': port,
'method': method, 'extra': extra})
LOG.exception(error_msg)
LOG.exception(_LE("Error contacting glance server "
"'%(host)s:%(port)s' for '%(method)s', "
"%(extra)s."),
{'host': host, 'port': port,
'method': method, 'extra': extra})
if attempt == num_attempts:
raise exception.GlanceConnectionFailed(
host=host, port=port, reason=six.text_type(e))
@@ -349,9 +348,8 @@ class GlanceImageService(object):
if xfer_mod:
try:
xfer_mod.download(context, o, dst_path, loc_meta)
msg = _("Successfully transferred "
"using %s") % o.scheme
LOG.info(msg)
LOG.info(_LI("Successfully transferred "
"using %s"), o.scheme)
return
except Exception:
LOG.exception(_LE("Download image error"))