diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-16 11:37:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-16 11:37:53 +0100 |
| commit | 25c2332071f9f26111a54e099b9884b4a382ac2f (patch) | |
| tree | c388750ddc395cf25d44337d1897a133bb7e0b1e /synapse/replication | |
| parent | Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into ... (diff) | |
| parent | Use cached get_user_by_access_token in slaves (diff) | |
| download | synapse-25c2332071f9f26111a54e099b9884b4a382ac2f.tar.xz | |
Merge pull request #1010 from matrix-org/erikj/refactor_deletions
Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to slaves.
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__ |