openstack/freezer-web-ui
Code Issues Proposed changes

Use correct parameter when handling exceptions

Browse Source 
Before this fix, error handling code passed the view rather than the request object to exeptions.handle().
This resulted in an exception in the error handling code which made the actual error harder to identify.

Also added a check to see if the redirect goes to the same page which would result in an endless loop.

Fixes bug: 1555642

Change-Id: Ie941ff4d595a375e5fa808703b146e86d4d56e1f
This commit is contained in:
Jonas Pfannschmidt 2016-03-10 13:39:24 +00:00
parent b224700939
commit c66c23ec4e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
disaster_recovery/utils.py
View File

@ -23,6 +23,7 @@ from django.template.defaultfilters import date as django_date
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
from horizon import get_user_home
LOG = logging.getLogger(__name__)
@ -182,15 +183,23 @@ def shield(message, redirect=''):
def wrap(function):
@wraps(function)
def wrapped_function(request, *args, **kwargs):
def wrapped_function(view, *args, **kwargs):
try:
return function(request, *args, **kwargs)
return function(view, *args, **kwargs)
except Exception as error:
LOG.error(error.message)
namespace = "horizon:disaster_recovery:"
r = reverse("{0}{1}".format(namespace, redirect))
exceptions.handle(request, _(message), redirect=r)
if view.request.path == r:
# To avoid an endless loop, we must not redirect to the
# same page on which the error happened
user_home = get_user_home(view.request.user)
exceptions.handle(view.request, _(message),
redirect=user_home)
else:
exceptions.handle(view.request, _(message), redirect=r)
return wrapped_function
return wrap