X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pcubad.py;h=6ca478f914aebcf2d3e3e573f3d68198e5351b65;hb=bbdd1222ad57a915bbb3d872a1cf1da759ef85e3;hp=e13accc2f5a0321398f3494d9881492983891307;hpb=da913fbd1629fc4669b186915df8ff3a340482d3;p=monitor.git

diff --git a/pcubad.py b/pcubad.py
index e13accc..6ca478f 100755
--- a/pcubad.py
+++ b/pcubad.py
@@ -7,10 +7,11 @@ import time
 from datetime import datetime,timedelta
 
 from monitor import database
-from monitor.pcu import reboot
+from pcucontrol  import reboot
 from monitor import parser as parsermodule
 from monitor import config
-from monitor.database import HistoryPCURecord, FindbadPCURecord
+from monitor.database.info.model import HistoryPCURecord, FindbadPCURecord
+from monitor.database.dborm import mon_session as session
 from monitor.wrapper import plc,plccache
 from monitor.const import MINUP
 
@@ -22,7 +23,6 @@ api = plc.getAuthAPI()
 
 def main(config):
 
-	#l_plcpcus = database.if_cached_else_refresh(1, 1, "pculist", lambda : plc.GetPCUs())
 	l_plcpcus = plccache.l_pcus 
 
 	l_pcus = None
@@ -94,6 +94,7 @@ def checkAndRecordState(l_pcus, l_plcpcus):
 	# replace with another operations that also commits all pending ops, such
 	# as session.commit() or flush() or something
 	print HistoryPCURecord.query.count()
+	session.flush()
 
 	return True