use new monitor.database for data model import

[monitor.git] / nodecommon.py

diff --git a/nodecommon.py b/nodecommon.py
index ba67625..f318949 100644 (file)
--- a/nodecommon.py
+++ b/nodecommon.py
@@ -2,8 +2,9 @@
 import struct
 import reboot
 import time
-import util.file
+from monitor import util
 import plc
+from datetime import datetime 
 from monitor import database
 from unified_model import PersistFlags
 esc = struct.pack('i', 27)
@@ -132,13 +133,16 @@ def nodegroup_display(node, fb, conf=None):
        node['pcu'] = fb['nodes'][node['hostname']]['values']['pcu']
        node['lastupdate'] = diff_time(node['last_contact'])
        pf = PersistFlags(node['hostname'], 1, db='node_persistflags')
-       node['lc'] = diff_time(pf.last_changed)
+       try:
+               node['lc'] = diff_time(pf.last_changed)
+       except:
+               node['lc'] = "err"
        ut = fb['nodes'][node['hostname']]['values']['comonstats']['uptime']
        if ut != "null":
                ut = diff_time(float(fb['nodes'][node['hostname']]['values']['comonstats']['uptime']), False)
        node['uptime'] = ut
 
-       return "%(hostname)-42s %(boot_state)8s %(current)5s %(pcu)6s %(key)10.10s... %(kernel)33s %(lastupdate)12s, %(lc)s, %(uptime)s" % node
+       return "%(hostname)-42s %(boot_state)8s %(current)5s %(pcu)6s %(key)10.10s... %(kernel)35.35s %(lastupdate)12s, %(lc)s, %(uptime)s" % node
 
 def datetime_fromstr(str):
        if '-' in str: