use plccache, instead of directly loading pkl files

[monitor.git] / pcubad.py

diff --git a/pcubad.py b/pcubad.py
index 1fd3371..6a1098b 100755 (executable)
--- a/pcubad.py
+++ b/pcubad.py
@@ -11,19 +11,19 @@ from monitor.pcu import reboot
 from monitor import parser as parsermodule
 from monitor import config
 from monitor.database import HistoryPCURecord, FindbadPCURecord
-from monitor.wrapper import plc
+from monitor.wrapper import plc,plccache
 from monitor.const import MINUP
 
 from nodecommon import *
 from nodequery import verify,query_to_dict,node_select
-import syncplcdb
 from unified_model import *
 
 api = plc.getAuthAPI()
 
 def main(config):
 
-       l_plcpcus = database.if_cached_else_refresh(1, 1, "pculist", lambda : plc.GetPCUs())
+       #l_plcpcus = database.if_cached_else_refresh(1, 1, "pculist", lambda : plc.GetPCUs())
+       l_plcpcus = plccache.l_pcus 
 
        l_pcus = None
        if config.pcu:
@@ -39,7 +39,7 @@ def main(config):
        
        checkAndRecordState(l_pcus, l_plcpcus)
 
-hn2lb = database.dbLoad("plcdb_hn2lb")
+hn2lb = plccache.plcdb_hn2lb
 
 def checkAndRecordState(l_pcus, l_plcpcus):
        count = 0