MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-15 03:23:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4667 from matrix-org/erikj/fix_revoke_guest_access_workers

Browse source 
Fix kicking guest users in worker mode
This commit is contained in:
Erik Johnston 2019-02-18 15:55:48 +00:00 committed by GitHub
commit c30f73c86a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/4667.bugfix Normal file
View file

@ -0,0 +1 @@
Fix kicking guest users on guest access revocation in worker mode.

2
synapse/app/federation_reader.py
View file

@ -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.push_rule import SlavedPushRuleStore
from synapse.replication.slave.storage.pushers import SlavedPusherStore from synapse.replication.slave.storage.pushers import SlavedPusherStore
from synapse.replication.slave.storage.receipts import SlavedReceiptsStore 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.room import RoomStore
from synapse.replication.slave.storage.transactions import SlavedTransactionStore from synapse.replication.slave.storage.transactions import SlavedTransactionStore
from synapse.replication.tcp.client import ReplicationClientHandler from synapse.replication.tcp.client import ReplicationClientHandler
@ -62,6 +63,7 @@ class FederationReaderSlavedStore(
SlavedReceiptsStore, SlavedReceiptsStore,
SlavedEventStore, SlavedEventStore,
SlavedKeyStore, SlavedKeyStore,
SlavedRegistrationStore,
RoomStore, RoomStore,
DirectoryStore, DirectoryStore,
SlavedTransactionStore, SlavedTransactionStore,

2
synapse/handlers/_base.py
View file

@ -167,4 +167,4 @@ class BaseHandler(object):
ratelimit=False, ratelimit=False,
) )
except Exception as e: except Exception as e:
logger.warn("Error kicking guest user: %s" % (e,)) logger.exception("Error kicking guest user: %s" % (e,))