Преглед изворни кода

[zookeeper] Avoid 500 when no configured cluster

Romain Rigaux пре 12 година
родитељ
комит
e0cf015
1 измењених фајлова са 8 додато и 3 уклоњено
  1. 8 3
      apps/zookeeper/src/zookeeper/views.py

+ 8 - 3
apps/zookeeper/src/zookeeper/views.py

@@ -22,12 +22,14 @@ except ImportError:
 
 import logging
 
-from desktop.lib.django_util import render
 from django.http import Http404, HttpResponse
 from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
 
-from zookeeper import settings
+from desktop.lib.django_util import render
+from desktop.lib.exceptions_renderable import PopupException
 
+from zookeeper import settings
 from zookeeper.conf import CLUSTERS
 from zookeeper.forms import CreateZNodeForm, EditZNodeForm
 from zookeeper.stats import ZooKeeperStats
@@ -67,7 +69,10 @@ def _group_stats_by_role(stats):
 
 
 def index(request):
-  overview = _get_global_overview()
+  try:
+    overview = _get_global_overview()
+  except Exception, e:
+    raise PopupException(_('Could not correctly connect to Zookeeper.'), detail=e)
 
   return render('index.mako', request, {
       'clusters': CLUSTERS.get(),