openstack/horizon
Code Issues Proposed changes

Merge "Use new log style when LOG.error"

Browse Source
This commit is contained in:
Jenkins 2016-01-05 09:04:45 +00:00 committed by Gerrit Code Review
commit f5057aa30b
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/api/neutron.py
View File

@ -1091,7 +1091,7 @@ def servers_update_addresses(request, servers, all_tenants=False):
ports_floating_ips, ports_floating_ips,
network_names) network_names)
except Exception as e: except Exception as e:
LOG.error(e) LOG.error(six.text_type(e))
else: else:
server.addresses = addresses server.addresses = addresses

4
openstack_dashboard/dashboards/project/instances/workflows/create_instance.py
View File

@ -21,6 +21,7 @@ import logging
import operator import operator
from oslo_utils import units from oslo_utils import units
import six
from django.template.defaultfilters import filesizeformat # noqa from django.template.defaultfilters import filesizeformat # noqa
from django.utils.text import normalize_newlines # noqa from django.utils.text import normalize_newlines # noqa
@ -688,7 +689,8 @@ class CustomizeAction(workflows.Action):
except Exception as e: except Exception as e:
msg = _('There was a problem parsing the' msg = _('There was a problem parsing the'
' %(prefix)s: %(error)s') ' %(prefix)s: %(error)s')
msg = msg % {'prefix': prefix, 'error': e} msg = msg % {'prefix': prefix,
'error': six.text_type(e)}
raise forms.ValidationError(msg) raise forms.ValidationError(msg)
return script return script
else: else:

2
openstack_dashboard/dashboards/project/stacks/forms.py
View File

@ -191,7 +191,7 @@ class TemplateForm(forms.SelfHandlingForm):
except Exception as e: except Exception as e:
msg = _('There was a problem parsing the' msg = _('There was a problem parsing the'
' %(prefix)s: %(error)s') ' %(prefix)s: %(error)s')
msg = msg % {'prefix': prefix, 'error': e} msg = msg % {'prefix': prefix, 'error': six.text_type(e)}
raise forms.ValidationError(msg) raise forms.ValidationError(msg)
cleaned[data_str] = tpl cleaned[data_str] = tpl