diff options
| author | Erik Johnston <erik@matrix.org> | 2019-02-18 14:08:13 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-02-18 14:16:07 +0000 |
| commit | 32e54b472a6c6c12d0b92ac46c8733c300589f19 (patch) | |
| tree | 31fb5317fcd8de1696066e464f39f9cdeb9d5805 /synapse | |
| parent | Merge pull request #4657 from matrix-org/travis/linda/spelling (diff) | |
| download | synapse-32e54b472a6c6c12d0b92ac46c8733c300589f19.tar.xz | |
Fix kicking guest users in worker mode
When guest_access changes from allowed to forbidden all local guest users should be kicked from the room. This did not happen when revocation was received from federation on a worker. Presumably broken in #4141
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/app/federation_reader.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/_base.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/app/federation_reader.py b/synapse/app/federation_reader.py index 6ee2b76dcd..b116c17669 100644 --- a/synapse/app/federation_reader.py +++ b/synapse/app/federation_reader.py @@ -40,6 +40,7 @@ from synapse.replication.slave.storage.profile import SlavedProfileStore from synapse.replication.slave.storage.push_rule import SlavedPushRuleStore from synapse.replication.slave.storage.pushers import SlavedPusherStore from synapse.replication.slave.storage.receipts import SlavedReceiptsStore +from synapse.replication.slave.storage.registration import SlavedRegistrationStore from synapse.replication.slave.storage.room import RoomStore from synapse.replication.slave.storage.transactions import SlavedTransactionStore from synapse.replication.tcp.client import ReplicationClientHandler @@ -62,6 +63,7 @@ class FederationReaderSlavedStore( SlavedReceiptsStore, SlavedEventStore, SlavedKeyStore, + SlavedRegistrationStore, RoomStore, DirectoryStore, SlavedTransactionStore, diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py index 704181d2d3..594754cfd8 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py @@ -167,4 +167,4 @@ class BaseHandler(object): ratelimit=False, ) except Exception as e: - logger.warn("Error kicking guest user: %s" % (e,)) + logger.exception("Error kicking guest user: %s" % (e,)) |