Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-11-13 01:10:38 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into state-chache

Browse source 
Conflicts:
	synapse/app/homeserver.py
	synapse/state.py
This commit is contained in:
Erik Johnston 2015-02-10 11:04:37 +00:00
commit c86ebe7673
18 changed files with 291 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/app/homeserver.py
View file

@ -67,7 +67,7 @@ class SynapseHomeServer(HomeServer):
return ClientV2AlphaRestResource(self)
def build_resource_for_federation(self):
return JsonResource()
return JsonResource(self)
def build_resource_for_web_client(self):
syweb_path = os.path.dirname(syweb.__file__)
@ -275,6 +275,7 @@ def setup():
hs.get_pusherpool().start()
hs.get_state_handler().start_caching()
hs.get_datastore().start_profiling()
if config.daemonize:
print config.pid_file