Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 21:44:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Erik Johnston 2015-08-07 19:28:39 +01:00
commit 7dec0b2bee
5 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/storage/__init__.py
View file

@ -354,6 +354,11 @@ def _upgrade_existing_database(cur, current_version, applied_delta_files,
)
logger.debug("Running script %s", relative_path)
module.run_upgrade(cur, database_engine)
elif ext == ".pyc":
# Sometimes .pyc files turn up anyway even though we've
# disabled their generation; e.g. from distribution package
# installers. Silently skip it
pass
elif ext == ".sql":
# A plain old .sql file, just read and execute it
logger.debug("Applying schema %s", relative_path)

7
synapse/storage/_base.py
View file

@ -186,8 +186,8 @@ class CacheDescriptor(object):
try:
cached_result_d = self.cache.get(keyargs)
observer = cached_result_d.observe()
if DEBUG_CACHES:
@defer.inlineCallbacks
def check_result(cached_result):
actual_result = yield self.function_to_call(obj, *args, **kwargs)
@ -198,9 +198,10 @@ class CacheDescriptor(object):
cached_result, actual_result,
)
raise ValueError("Stale cache entry")
cached_result_d.observe().addCallback(check_result)
defer.returnValue(cached_result)
observer.addCallback(check_result)
return cached_result_d.observe()
return observer
except KeyError:
# Get the sequence number of the cache before reading from the
# database so that we can tell if the cache is invalidated