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
unify the model by which probes are made to collect information about nodes or
[monitor.git]
/
nodeinfo.py
diff --git
a/nodeinfo.py
b/nodeinfo.py
index
fee8eb3
..
29d77bb
100755
(executable)
--- a/
nodeinfo.py
+++ b/
nodeinfo.py
@@
-1,20
+1,19
@@
#!/usr/bin/python
#!/usr/bin/python
-import plc
+
from monitor.wrapper
import plc
api = plc.getAuthAPI()
from monitor import *
api = plc.getAuthAPI()
from monitor import *
-#import database
-import reboot
+from monitor import util
+from monitor import parser as parsermodule
+
+from monitor import database
+from pcucontrol import reboot
import time
import time
-from model import *
+from mo
nitor.mo
del import *
from nodecommon import *
from nodecommon import *
-from unified_model import node_end_record, PersistFlags
-
-import util.file
-
-import parser as parsermodule
+#from monitor.model import node_end_record, PersistFlags
parser = parsermodule.getParser()
parser.set_defaults(node=None,
parser = parsermodule.getParser()
parser.set_defaults(node=None,
@@
-46,7
+45,10
@@
def plc_print_nodeinfo(plcnode):
def fb_print_nodeinfo(fbnode):
pf = PersistFlags(fbnode['hostname'], 1, db='node_persistflags')
def fb_print_nodeinfo(fbnode):
pf = PersistFlags(fbnode['hostname'], 1, db='node_persistflags')
- fbnode['last_change'] = diff_time(pf.last_changed)
+ 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'])
@@
-138,11
+140,11
@@
if config.findbad:
for node in config.args:
config.node = node
for node in config.args:
config.node = node
- fb = database.dbLoad("findbad")
plc_nodeinfo = api.GetNodes({'hostname': config.node}, None)[0]
plc_nodeinfo = api.GetNodes({'hostname': config.node}, None)[0]
- fb_node
info = fb['nodes'][config.node]['values']
-
+ fb_node
rec = FindbadNodeRecord.get_latest_by(hostname=node)
+ fb_nodeinfo = fb_noderec.to_dict()
plc_print_nodeinfo(plc_nodeinfo)
plc_print_nodeinfo(plc_nodeinfo)
+
fb_nodeinfo['hostname'] = node
fb_print_nodeinfo(fb_nodeinfo)
fb_nodeinfo['hostname'] = node
fb_print_nodeinfo(fb_nodeinfo)