OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

master startup

pull/4846/head
Amber Brown 2019-03-11 21:13:35 +11:00
parent 30a8deeb68
commit 8da22e2b53
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
synapse/app/homeserver.py
View File

@ -376,6 +376,7 @@ def setup(config_options):
logger.info("Database prepared in %s.", config.database_config['name']) logger.info("Database prepared in %s.", config.database_config['name'])
hs.setup() hs.setup()
hs.setup_master()
@defer.inlineCallbacks @defer.inlineCallbacks
def do_acme(): def do_acme():

8
synapse/server.py
View File

@ -185,6 +185,10 @@ class HomeServer(object):
'registration_handler', 'registration_handler',
] ]
REQUIRED_ON_MASTER_STARTUP = [
"user_directory_handler",
]
# This is overridden in derived application classes # This is overridden in derived application classes
# (such as synapse.app.homeserver.SynapseHomeServer) and gives the class to be # (such as synapse.app.homeserver.SynapseHomeServer) and gives the class to be
# instantiated during setup() for future return by get_datastore() # instantiated during setup() for future return by get_datastore()
@ -221,6 +225,10 @@ class HomeServer(object):
conn.commit() conn.commit()
logger.info("Finished setting up.") logger.info("Finished setting up.")
def setup_master(self):
for i in self.REQUIRED_ON_MASTER_STARTUP:
getattr(self, "get_" + i)()
def get_reactor(self): def get_reactor(self):
""" """
Fetch the Twisted reactor in use by this HomeServer. Fetch the Twisted reactor in use by this HomeServer.