Don't error out when we lose the race between listInfoDict and infoDict after request...
authorAdam Glasgall <adam@crossproduct.net>
Tue, 24 Sep 2013 02:16:49 +0000 (22:16 -0400)
committerAdam Glasgall <adam@crossproduct.net>
Tue, 24 Sep 2013 02:16:49 +0000 (22:16 -0400)
code/main.py

index b712696..86da50e 100755 (executable)
@@ -594,7 +594,11 @@ def modifyDict(username, state, machine_id, fields):
 
 def infoDict(username, state, machine):
     """Get the variables used by info.tmpl."""
-    status = controls.statusInfo(machine)
+    try:
+        status = controls.statusInfo(machine)
+    except CodeError, e:
+        # machine was shut down in between the call to listInfoDict and this
+        status = None
     has_vnc = hasVnc(status)
     if status is None:
         main_status = dict(name=machine.name,