Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 11:06:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add EDU/query handling over replication

Browse source
This commit is contained in:
Erik Johnston 2018-07-26 11:44:22 +01:00
parent e26dbd82ef
commit a3f5bf79a0
4 changed files with 62 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
synapse/handlers/federation.py
View file

@ -44,8 +44,10 @@ from synapse.crypto.event_signing import (
compute_event_signature,
)
from synapse.events.validator import EventValidator
from synapse.replication.http.federation import send_federation_events_to_master
from synapse.replication.http.membership import notify_user_membership_change
from synapse.replication.http.federation import (
ReplicationFederationSendEventsRestServlet,
)
from synapse.replication.http.membership import ReplicationUserJoinedLeftRoomRestServlet
from synapse.state import resolve_events_with_factory
from synapse.types import UserID, get_domain_from_id
from synapse.util import logcontext, unwrapFirstError
@ -91,6 +93,13 @@ class FederationHandler(BaseHandler):
self.config = hs.config
self.http_client = hs.get_simple_http_client()
self._send_events_to_master = (
ReplicationFederationSendEventsRestServlet.make_client(hs)
)
self._notify_user_membership_change = (
ReplicationUserJoinedLeftRoomRestServlet.make_client(hs)
)
# When joining a room we need to queue any events for that room up
self.room_queues = {}
self._room_pdu_linearizer = Linearizer("fed_room_pdu")
@ -2318,12 +2327,8 @@ class FederationHandler(BaseHandler):
Deferred
"""
if self.config.worker_app:
yield send_federation_events_to_master(
clock=self.hs.get_clock(),
yield self._send_events_to_master(
store=self.store,
client=self.http_client,
host=self.config.worker_replication_host,
port=self.config.worker_replication_http_port,
event_and_contexts=event_and_contexts,
backfilled=backfilled
)
@ -2381,10 +2386,7 @@ class FederationHandler(BaseHandler):
"""Called when a new user has joined the room
"""
if self.config.worker_app:
return notify_user_membership_change(
client=self.http_client,
host=self.config.worker_replication_host,
port=self.config.worker_replication_http_port,
return self._notify_user_membership_change(
room_id=room_id,
user_id=user.to_string(),
change="joined",