diff options
author | David Baker <dave@matrix.org> | 2016-08-16 16:46:37 +0100 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2016-08-16 16:46:37 +0100 |
commit | 0bba2799b6eeaf95b52ba9c4f2831def37d8effd (patch) | |
tree | f4da51c1d29e54bfa06c4935a188245592a99a90 /synapse/replication | |
parent | s/underride/override/ in the rule_id too (diff) | |
parent | Merge pull request #1015 from matrix-org/erikj/preview_url_fixes (diff) | |
download | synapse-0bba2799b6eeaf95b52ba9c4f2831def37d8effd.tar.xz |
Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name_override
Diffstat (limited to 'synapse/replication')
-rw-r--r-- | synapse/replication/slave/storage/_base.py | 2 | ||||
-rw-r--r-- | synapse/replication/slave/storage/registration.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/replication/slave/storage/_base.py b/synapse/replication/slave/storage/_base.py index d839d169ab..f19540d6bb 100644 --- a/synapse/replication/slave/storage/_base.py +++ b/synapse/replication/slave/storage/_base.py @@ -51,6 +51,6 @@ class BaseSlavedStore(SQLBaseStore): try: getattr(self, cache_func).invalidate(tuple(keys)) except AttributeError: - logger.warn("Got unexpected cache_func: %r", cache_func) + logger.info("Got unexpected cache_func: %r", cache_func) self._cache_id_gen.advance(int(stream["position"])) return defer.succeed(None) diff --git a/synapse/replication/slave/storage/registration.py b/synapse/replication/slave/storage/registration.py index 307833f9e1..38b78b97fc 100644 --- a/synapse/replication/slave/storage/registration.py +++ b/synapse/replication/slave/storage/registration.py @@ -25,6 +25,6 @@ class SlavedRegistrationStore(BaseSlavedStore): # TODO: use the cached version and invalidate deleted tokens get_user_by_access_token = RegistrationStore.__dict__[ "get_user_by_access_token" - ].orig + ] _query_for_auth = DataStore._query_for_auth.__func__ |