X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodeinfo.py;h=29d77bb7f93ea51b61e317c8be2e80110809a2ef;hb=3f501b69f366b8b6c62d35d6aea4ebf5fa0f1192;hp=4a946c5d4640273e162ca37f1fb3732de32c9ead;hpb=90b2e8e7cb145cb1f6b3780867617084441b6ca9;p=monitor.git diff --git a/nodeinfo.py b/nodeinfo.py index 4a946c5..29d77bb 100755 --- a/nodeinfo.py +++ b/nodeinfo.py @@ -8,12 +8,12 @@ from monitor import util from monitor import parser as parsermodule from monitor import database -from monitor.pcu import reboot +from pcucontrol import reboot import time -from model import * +from monitor.model import * from nodecommon import * -from unified_model import node_end_record, PersistFlags +#from monitor.model import node_end_record, PersistFlags parser = parsermodule.getParser() parser.set_defaults(node=None, @@ -45,7 +45,10 @@ def plc_print_nodeinfo(plcnode): 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'])