projects
/
invirt/packages/invirt-web.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
895b262
)
Don't error out when we lose the race between listInfoDict and infoDict after request...
author
Adam Glasgall
<adam@crossproduct.net>
Tue, 24 Sep 2013 02:16:49 +0000
(22:16 -0400)
committer
Adam Glasgall
<adam@crossproduct.net>
Tue, 24 Sep 2013 02:16:49 +0000
(22:16 -0400)
code/main.py
patch
|
blob
|
history
diff --git
a/code/main.py
b/code/main.py
index
b712696
..
86da50e
100755
(executable)
--- a/
code/main.py
+++ b/
code/main.py
@@
-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,