git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2to3 -f has_key
[sfa.git]
/
sfa
/
util
/
cache.py
diff --git
a/sfa/util/cache.py
b/sfa/util/cache.py
index
a2ded4a
..
38eccc9
100644
(file)
--- a/
sfa/util/cache.py
+++ b/
sfa/util/cache.py
@@
-8,7
+8,7
@@
import pickle
from datetime import datetime
# maximum lifetime of cached data (in seconds)
from datetime import datetime
# maximum lifetime of cached data (in seconds)
-
MAX
_CACHE_TTL = 60 * 60
+
DEFAULT
_CACHE_TTL = 60 * 60
class CacheData:
class CacheData:
@@
-17,7
+17,7
@@
class CacheData:
expires = None
lock = None
expires = None
lock = None
- def __init__(self, data, ttl =
MAX
_CACHE_TTL):
+ def __init__(self, data, ttl =
DEFAULT
_CACHE_TTL):
self.lock = threading.RLock()
self.data = data
self.renew(ttl)
self.lock = threading.RLock()
self.data = data
self.renew(ttl)
@@
-31,11
+31,11
@@
class CacheData:
def get_expires_date(self):
return str(datetime.fromtimestamp(self.expires))
def get_expires_date(self):
return str(datetime.fromtimestamp(self.expires))
- def renew(self, ttl =
MAX
_CACHE_TTL):
+ def renew(self, ttl =
DEFAULT
_CACHE_TTL):
self.created = time.time()
self.expires = self.created + ttl
self.created = time.time()
self.expires = self.created + ttl
- def set_data(self, data, renew=True, ttl =
MAX
_CACHE_TTL):
+ def set_data(self, data, renew=True, ttl =
DEFAULT
_CACHE_TTL):
with self.lock:
self.data = data
if renew:
with self.lock:
self.data = data
if renew:
@@
-73,9
+73,9
@@
class Cache:
if filename:
self.load_from_file(filename)
if filename:
self.load_from_file(filename)
- def add(self, key, value, ttl =
MAX
_CACHE_TTL):
+ def add(self, key, value, ttl =
DEFAULT
_CACHE_TTL):
with self.lock:
with self.lock:
- if
self.cache.has_key(key)
:
+ if
key in self.cache
:
self.cache[key].set_data(value, ttl=ttl)
else:
self.cache[key] = CacheData(value, ttl)
self.cache[key].set_data(value, ttl=ttl)
else:
self.cache[key] = CacheData(value, ttl)