Merge pull request #4667 from matrix-org/erikj/fix_revoke_guest_acces…

…s_workers Fix kicking guest users in worker mode
matrix-org · Feb 18, 2019 · c30f73c · c30f73c
2 parents d1b060b + e85aabb
commit c30f73c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/changelog.d/4667.bugfix 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
@@ -40,6 +40,7 @@
 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
@@ -167,4 +167,4 @@ def kick_guest_users(self, current_state):
                     ratelimit=False,
                 )
             except Exception as e:
-                logger.warn("Error kicking guest user: %s" % (e,))
+                logger.exception("Error kicking guest user: %s" % (e,))