move clean_policy.py into monitor package

[monitor.git] / nodeinfo.py

diff --git a/nodeinfo.py b/nodeinfo.py
index 4a946c5..3c8e4e5 100755 (executable)
--- a/nodeinfo.py
+++ b/nodeinfo.py
@@ -11,9 +11,9 @@ from monitor import database
 from monitor.pcu 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'])