X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=findbadpcu.py;h=83456371c8b2dc7959399fcb7e17b49a13736ce8;hb=da62714c855a89f1b50d21844fa8f1e709850ebb;hp=48b17617582b663879ee0c4c6917a02402da946b;hpb=19414270cf2c8429daab02fdebbd8081d9ba0db0;p=monitor.git

diff --git a/findbadpcu.py b/findbadpcu.py
index 48b1761..8345637 100755
--- a/findbadpcu.py
+++ b/findbadpcu.py
@@ -15,10 +15,10 @@ import threading
 import monitor
 from monitor.pcu import reboot
 from monitor import config
-from monitor.database import FindbadPCURecordSync, FindbadPCURecord
+from monitor.database.infovacuum import FindbadPCURecordSync, FindbadPCURecord
+from monitor.database.dborm import mon_session as session
 from monitor import util 
-from monitor.wrapper import plc
-import syncplcdb
+from monitor.wrapper import plc, plccache
 from nodequery import pcu_select
 
 plc_lock = threading.Lock()
@@ -50,7 +50,7 @@ def get_pcu(pcuname):
 	except:
 		try:
 			#print "GetPCU from file %s" % pcuname
-			l_pcus = database.dbLoad("pculist")
+			l_pcus = plccache.l_pcus
 			for i in l_pcus:
 				if i['pcu_id'] == pcuname:
 					l_pcu = i
@@ -68,7 +68,7 @@ def get_nodes(node_ids):
 		l_node = plc.getNodes(node_ids, ['hostname', 'last_contact', 'node_id', 'ports'])
 	except:
 		try:
-			plc_nodes = database.dbLoad("l_plcnodes")
+			plc_nodes = plccache.l_plcnodes
 			for n in plc_nodes:
 				if n['node_id'] in node_ids:
 					l_node.append(n)
@@ -124,7 +124,7 @@ def get_plc_site_values(site_id):
 			d_site = d_site[0]
 	except:
 		try:
-			plc_sites = database.dbLoad("l_plcsites")
+			plc_sites = plccache.l_plcsites
 			for site in plc_sites:
 				if site['site_id'] == site_id:
 					d_site = site
@@ -275,6 +275,7 @@ def recordPingAndSSH(request, result):
 
 		fbrec = FindbadPCURecord(
 					date_checked=datetime.fromtimestamp(values['date_checked']),
+					record=fbsync.round,
 					plc_pcuid=pcu_id,
 					plc_pcu_stats=values['plc_pcu_stats'],
 					dns_status=values['dnsmatch'],
@@ -340,12 +341,14 @@ def checkAndRecordState(l_pcus, cohash):
 
 	print FindbadPCURecordSync.query.count()
 	print FindbadPCURecord.query.count()
+	session.flush()
 
 
 def main():
 	global global_round
 
-	l_pcus = monitor.database.if_cached_else_refresh(1, config.refresh, "pculist", lambda : plc.GetPCUs())
+	#  monitor.database.if_cached_else_refresh(1, config.refresh, "pculist", lambda : plc.GetPCUs())
+	l_pcus = plccache.l_pcus
 	cohash = {}
 
 	fbsync = FindbadPCURecordSync.findby_or_create(plc_pcuid=0, if_new_set={'round' : global_round})