openstack/rally
Code Issues Proposed changes

Merge "debug level logs should not be translated"

Browse Source
This commit is contained in:
Jenkins 2014-05-12 19:32:03 +00:00 committed by Gerrit Code Review
commit 6f84f375be
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rally/benchmark/context/cleanup/cleanup.py
View File

@ -79,7 +79,7 @@ class ResourceCleaner(base.Context):
try:
cleanup_methods[service]()
except Exception as e:
LOG.debug(_("Not all resources were cleaned."),
LOG.debug("Not all resources were cleaned.",
exc_info=sys.exc_info())
LOG.warning(_('Unable to fully cleanup the cloud: %s') %
(e.message))
@ -90,7 +90,7 @@ class ResourceCleaner(base.Context):
admin = osclients.Clients(self.admin)
utils.delete_keystone_resources(admin.keystone())
except Exception as e:
LOG.debug(_("Not all resources were cleaned."),
LOG.debug("Not all resources were cleaned.",
exc_info=sys.exc_info())
LOG.warning(_('Unable to fully cleanup keystone service: %s') %
(e.message))

6
rally/benchmark/scenarios/vm/vmtasks.py
View File

@ -73,7 +73,7 @@ class VMTasks(nova_utils.NovaScenario, vm_utils.VMScenario):
LOG.warning(_("Script %s did not output valid JSON.") % script)
self._delete_server(server)
LOG.debug(_("Output streams from in-instance script execution: "
"stdout: %(stdout)s, stderr: $(stderr)s") % dict(
stdout=out, stderr=err))
LOG.debug("Output streams from in-instance script execution: "
"stdout: %(stdout)s, stderr: $(stderr)s" % dict(
stdout=out, stderr=err))
return {"data": out, "errors": err}

6
rally/sshutils.py
View File

@ -182,14 +182,14 @@ class SSH(object):
if session.recv_ready():
data = session.recv(4096)
LOG.debug(_('stdout: %r') % data)
LOG.debug('stdout: %r' % data)
if stdout is not None:
stdout.write(data)
continue
if session.recv_stderr_ready():
stderr_data = session.recv_stderr(4096)
LOG.debug(_('stderr: %r') % stderr_data)
LOG.debug('stderr: %r' % stderr_data)
if stderr is not None:
stderr.write(stderr_data)
continue
@ -253,7 +253,7 @@ class SSH(object):
try:
return self.execute('uname')
except (socket.error, SSHError) as e:
LOG.debug(_('Ssh is still unavailable: %r') % e)
LOG.debug('Ssh is still unavailable: %r' % e)
time.sleep(interval)
if time.time() > (start_time + timeout):
raise SSHTimeout(_('Timeout waiting for "%s"') % self.host)

2
rally/utils.py
View File

@ -187,7 +187,7 @@ def load_plugins(directory):
fp, pathname, descr = imp.find_module(plugin, [directory])
imp.load_module(plugin, fp, pathname, descr)
fp.close()
LOG.debug(_("Load plugin from file %s") % fullpath)
LOG.debug("Load plugin from file %s" % fullpath)
except Exception as e:
LOG.error(_("Couldn't load module from %(path)s: %(msg)s") %
{"path": fullpath, "msg": e.message})