diff options
| author | Erik Johnston <erikj@jki.re> | 2019-02-18 15:55:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-18 15:55:48 +0000 |
| commit | c30f73c86abe682af9001370f3f86f3693afcec4 (patch) | |
| tree | 6346611f61b9536994fc638c8e1c16812eb475ea | |
| parent | Merge pull request #4643 from matrix-org/erikj/catch_exceptions (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-c30f73c86abe682af9001370f3f86f3693afcec4.tar.xz | |
Merge pull request #4667 from matrix-org/erikj/fix_revoke_guest_access_workers
Fix kicking guest users in worker mode
| -rw-r--r-- | changelog.d/4667.bugfix | 1 | ||||
| -rw-r--r-- | synapse/app/federation_reader.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/_base.py | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/changelog.d/4667.bugfix b/changelog.d/4667.bugfix new file mode 100644 index 0000000000..33ad00c137 --- /dev/null +++ b/changelog.d/4667.bugfix @@ -0,0 +1 @@ +Fix kicking guest users on guest access revocation in worker mode. 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,)) |