Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cached_keyword_args

This commit is contained in:
Erik Johnston 2015-08-06 13:35:03 +01:00
commit 953dbd28a7
8 changed files with 305 additions and 140 deletions

View file

@ -58,7 +58,7 @@ cache_counter = metrics.register_cache(
class Cache(object):
def __init__(self, name, max_entries=1000, keylen=1, lru=False):
def __init__(self, name, max_entries=1000, keylen=1, lru=True):
if lru:
self.cache = LruCache(max_size=max_entries)
self.max_entries = None
@ -142,7 +142,7 @@ class CacheDescriptor(object):
which can be used to insert values into the cache specifically, without
calling the calculation function.
"""
def __init__(self, orig, max_entries=1000, num_args=1, lru=False,
def __init__(self, orig, max_entries=1000, num_args=1, lru=True,
inlineCallbacks=False):
self.orig = orig
@ -210,7 +210,7 @@ class CacheDescriptor(object):
return wrapped
def cached(max_entries=1000, num_args=1, lru=False):
def cached(max_entries=1000, num_args=1, lru=True):
return lambda orig: CacheDescriptor(
orig,
max_entries=max_entries,