mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-03 20:04:51 -04:00
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_profiles
This commit is contained in:
commit
782689bd40
244 changed files with 3678 additions and 2977 deletions
|
@ -36,6 +36,7 @@ from synapse.federation.federation_client import FederationClient
|
|||
from synapse.federation.federation_server import (
|
||||
FederationHandlerRegistry,
|
||||
FederationServer,
|
||||
ReplicationFederationHandlerRegistry,
|
||||
)
|
||||
from synapse.federation.send_queue import FederationRemoteSendQueue
|
||||
from synapse.federation.transaction_queue import TransactionQueue
|
||||
|
@ -426,7 +427,10 @@ class HomeServer(object):
|
|||
return RoomMemberMasterHandler(self)
|
||||
|
||||
def build_federation_registry(self):
|
||||
return FederationHandlerRegistry()
|
||||
if self.config.worker_app:
|
||||
return ReplicationFederationHandlerRegistry(self)
|
||||
else:
|
||||
return FederationHandlerRegistry()
|
||||
|
||||
def build_server_notices_manager(self):
|
||||
if self.config.worker_app:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue