X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=monitor%2Fwrapper%2Fplccache.py;h=60dbd2281ad3ddd1cfdbe0bc9af01ae5826071a5;hb=145f2f31748357892139d5271f292c949bc9d062;hp=3ddf6f24e20a180aef41c197ef6d6e44ead36ef1;hpb=dcf94cd60b68ca3a3cd38a55d32bdf49b4639b99;p=monitor.git

diff --git a/monitor/wrapper/plccache.py b/monitor/wrapper/plccache.py
index 3ddf6f2..60dbd22 100755
--- a/monitor/wrapper/plccache.py
+++ b/monitor/wrapper/plccache.py
@@ -4,6 +4,7 @@ import sys
 from monitor.wrapper import plc
 from monitor.generic import *
 from monitor.database.info.model import *
+from monitor import database
 import profile
 
 
@@ -15,6 +16,54 @@ plcdb_hn2lb = None
 plcdb_lb2hn = None
 plcdb_id2lb = None
 
+class CachedPLC(PLC):
+
+	def _param_to_str(self, name, *params):
+		fields = len(params)
+		retstr = ""
+		retstr += "%s-" % name
+		for x in params:
+			retstr += "%s-" % x
+		return retstr[:-1]
+
+	def __getattr__(self, name):
+		method = getattr(self.api, name)
+		if method is None:
+			raise AssertionError("method does not exist")
+
+		def run_or_returncached(*params):
+			cachename = self._param_to_str(name, *params)
+			#print "cachename is %s" % cachename
+			if hasattr(config, 'refresh'):
+				refresh = config.refresh
+			else:
+				refresh = False
+
+			if 'Get' in name:
+				if not database.cachedRecently(cachename):
+					load_old_cache = False
+					try:
+						values = method(self.auth, *params)
+					except:
+						print "Call %s FAILED: Using old cached data" % cachename
+						load_old_cache = True
+
+					if load_old_cache:
+						values = database.dbLoad(cachename)
+					else:
+						database.dbDump(cachename, values)
+
+					return values
+				else:
+					values = database.dbLoad(cachename)
+					return values
+			else:
+				return method(self.auth, *params)
+
+		return run_or_returncached
+
+cacheapi = CachedPLC(plc.auth.auth, plc.auth.server)
+
 def init():
 	import traceback
 	#print "IMPORTING PLCCACHE: ",