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
svn merge -r 12308:13112 https://svn.planet-lab.org/svn/Monitor/branches/2.0/
[monitor.git]
/
nodeinfo.py
diff --git
a/nodeinfo.py
b/nodeinfo.py
index
4a946c5
..
726f250
100755
(executable)
--- a/
nodeinfo.py
+++ b/
nodeinfo.py
@@
-7,13
+7,13
@@
from monitor import *
from monitor import util
from monitor import parser as parsermodule
from monitor import util
from monitor import parser as parsermodule
-from monitor
import database
-from monitor
.pcu
import reboot
+from monitor
.database.info.model import *
+from monitor import reboot
import time
import time
-from model import *
-from
node
common import *
-
from unified_
model import node_end_record, PersistFlags
+from mo
nitor.mo
del import *
+from
monitor.
common import *
+
#from monitor.
model import node_end_record, PersistFlags
parser = parsermodule.getParser()
parser.set_defaults(node=None,
parser = parsermodule.getParser()
parser.set_defaults(node=None,
@@
-44,8
+44,11
@@
def plc_print_nodeinfo(plcnode):
diff_time(plcnode['last_contact']), plcnode['key'])
def fb_print_nodeinfo(fbnode):
diff_time(plcnode['last_contact']), plcnode['key'])
def fb_print_nodeinfo(fbnode):
- pf = PersistFlags(fbnode['hostname'], 1, db='node_persistflags')
- fbnode['last_change'] = diff_time(pf.last_changed)
+ pf = HistoryNodeRecord.get_by(hostname= fbnode['hostname'])
+ try:
+ fbnode['last_change'] = diff_time(pf.last_changed)
+ except:
+ fbnode['last_change'] = diff_time(time.time())
print " Checked: ",
if 'checked' in fbnode:
print "%11.11s " % diff_time(fbnode['checked'])
print " Checked: ",
if 'checked' in fbnode:
print "%11.11s " % diff_time(fbnode['checked'])
@@
-137,7
+140,7
@@
if config.findbad:
for node in config.args:
config.node = node
for node in config.args:
config.node = node
- plc_nodeinfo =
api.GetNodes({'hostname': config.node}, None)[0]
+ plc_nodeinfo =
plccache.GetNodeByName(config.node)
fb_noderec = FindbadNodeRecord.get_latest_by(hostname=node)
fb_nodeinfo = fb_noderec.to_dict()
plc_print_nodeinfo(plc_nodeinfo)
fb_noderec = FindbadNodeRecord.get_latest_by(hostname=node)
fb_nodeinfo = fb_noderec.to_dict()
plc_print_nodeinfo(plc_nodeinfo)