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

Merge branch 'develop' into application-services

Browse source
This commit is contained in:
Kegan Dougal 2015-02-09 15:20:56 +00:00
commit 53557fc532
19 changed files with 318 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/app/homeserver.py
View file

@ -68,7 +68,7 @@ class SynapseHomeServer(HomeServer):
return ClientV2AlphaRestResource(self)
def build_resource_for_federation(self):
return JsonResource()
return JsonResource(self)
def build_resource_for_app_services(self):
return AppServiceRestResource(self)
@ -279,6 +279,8 @@ def setup():
hs.get_pusherpool().start()
hs.get_datastore().start_profiling()
if config.daemonize:
print config.pid_file
daemon = Daemonize(