git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge from 2.0 branch
[monitor.git]
/
nodequery.py
diff --git
a/nodequery.py
b/nodequery.py
index
1f41ceb
..
e9001a6
100755
(executable)
--- a/
nodequery.py
+++ b/
nodequery.py
@@
-413,12
+413,13
@@
def main():
try:
# Find the most recent record
fb_noderec = FindbadNodeRecord.get_latest_by(hostname=node)
try:
# Find the most recent record
fb_noderec = FindbadNodeRecord.get_latest_by(hostname=node)
+ if not fb_noderec: continue
+ fb_nodeinfo = fb_noderec.to_dict()
except:
print traceback.print_exc()
except:
print traceback.print_exc()
- pass
+ continue
if config.listkeys:
if config.listkeys:
- fb_nodeinfo = fb_noderec.to_dict()
print "Primary keys available in the findbad object:"
for key in fb_nodeinfo.keys():
print "\t",key
print "Primary keys available in the findbad object:"
for key in fb_nodeinfo.keys():
print "\t",key
@@
-431,7
+432,6
@@
def main():
if config.daysdown:
daysdown_print_nodeinfo(fb_nodeinfo, node)
else:
if config.daysdown:
daysdown_print_nodeinfo(fb_nodeinfo, node)
else:
- fb_nodeinfo = fb_noderec.to_dict()
if config.select:
if config.fields:
fields = config.fields.split(",")
if config.select:
if config.fields:
fields = config.fields.split(",")