X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=dumpact.py;h=b710a54f0bbddb3b2b96f7ac1706229150b95d39;hb=refs%2Fheads%2F1.0;hp=6a9c3b6c1f3e90f851def577e047c720099e62ee;hpb=c4906d8b47549fc8aca2d6bde100efe6f9d8bf8d;p=monitor.git

diff --git a/dumpact.py b/dumpact.py
index 6a9c3b6..b710a54 100755
--- a/dumpact.py
+++ b/dumpact.py
@@ -5,12 +5,12 @@
 import sys
 import time
 import getopt
-import soltesz
+import database 
 
 def main():
 
-	act_all = soltesz.dbLoad(sys.argv[1])
-	plcdb_hn2lb = soltesz.dbLoad("plcdb_hn2lb")
+	act_all = database.dbLoad(sys.argv[1])
+	plcdb_hn2lb = database.dbLoad("plcdb_hn2lb")
 	s_nodenames = ""
 	sickdb = {}
 
@@ -18,10 +18,11 @@ def main():
 	sorted_keys.sort()
 	for nodename in sorted_keys:
 		diag_nodelist = act_all[nodename]
-		lb = plcdb_hn2lb[nodename]
-		if lb not in sickdb:
-			sickdb[lb] = {}
-		sickdb[lb][nodename] = diag_nodelist
+		if nodename in plcdb_hn2lb:
+			lb = plcdb_hn2lb[nodename]
+			if lb not in sickdb:
+				sickdb[lb] = {}
+			sickdb[lb][nodename] = diag_nodelist
 
 	sorted_keys = sickdb.keys()
 	sorted_keys.sort()
@@ -37,12 +38,15 @@ def main():
 				l_ev = act_all[nodename]
 				print "    %s" % nodename
 				for diag_node in l_ev:
-					#s_time=time.strftime("%Y/%m/%d %H:%M:%S",time.gmtime(ev[1]))
 					keys = diag_node.keys()
 					keys.sort()
 					for k in keys:
 						if "message" not in k and "msg" not in k:
-							print "\t'%s' : %s" % (k, diag_node[k])
+							if 'time' in k:
+								s_time=time.strftime("%Y/%m/%d %H:%M:%S", time.gmtime(diag_node[k]))
+								print "\t'%s' : %s" % (k, s_time)
+							else:
+								print "\t'%s' : %s" % (k, diag_node[k])
 					print "\t--"
 
 	print s_nodenames