Don't assume that jails exist

truenas · Jun 26, 2013 · 4b191e3 · 4b191e3
1 parent 6bf0ef5
commit 4b191e3
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/gui/middleware/notifier.py b/gui/middleware/notifier.py
@@ -807,19 +807,22 @@ def _started_plugins(self, jail=None, plugin=None):
     def pluginjail_running(self, pjail=None):
         running = False
 
-        wlist = Warden().list()
-        for wj in wlist:
-            wj = WardenJail(**wj)
-            if pjail and wj.host == pjail:
-                if wj.type == WARDEN_TYPE_PLUGINJAIL and \
+        try:
+            wlist = Warden().list()
+            for wj in wlist:
+                wj = WardenJail(**wj)
+                if pjail and wj.host == pjail:
+                    if wj.type == WARDEN_TYPE_PLUGINJAIL and \
+                        wj.status == WARDEN_STATUS_RUNNING:
+                        running = True
+                        break
+
+                elif not pjail and wj.type == WARDEN_TYPE_PLUGINJAIL and \
                     wj.status == WARDEN_STATUS_RUNNING:
                     running = True
                     break
-
-            elif not pjail and wj.type == WARDEN_TYPE_PLUGINJAIL and \
-                wj.status == WARDEN_STATUS_RUNNING:
-                running = True
-                break
+        except:
+            pass
 
         return running