Merge branch 'master' of ssh://git.planet-lab.org/git/sfa

[sfa.git] / sfa / util / cache.py

diff --git a/sfa/util/cache.py b/sfa/util/cache.py
index fcea588..a2ded4a 100644 (file)
--- a/sfa/util/cache.py
+++ b/sfa/util/cache.py
@@ -6,7 +6,6 @@ import time
 import threading
 import pickle
 from datetime import datetime
-from pprint import pprint
 
 # maximum lifetime of cached data (in seconds) 
 MAX_CACHE_TTL = 60 * 60
@@ -69,6 +68,10 @@ class Cache:
 
     cache  = {}
     lock = threading.RLock()
+
+    def __init__(self, filename=None):
+        if filename:
+            self.load_from_file(filename)
    
     def add(self, key, value, ttl = MAX_CACHE_TTL):
         with self.lock:
@@ -79,9 +82,18 @@ class Cache:
            
     def get(self, key):
         data = self.cache.get(key)
-        if not data or data.is_expired():
-            return None 
-        return data.get_data()
+        if not data:  
+            data = None
+        elif data.is_expired():
+            self.pop(key)
+            data = None 
+        else:
+            data = data.get_data()
+        return data
+
+    def pop(self, key):
+        if key in self.cache:
+            self.cache.pop(key) 
 
     def dump(self):
         result = {}