summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-10 11:04:37 +0000
committerErik Johnston <erik@matrix.org>2015-02-10 11:04:37 +0000
commitc86ebe76736a4cde48cfb3229d894a174c6bd379 (patch)
treeafc236e8ef1bdbd6d0686747b99743661522638e /synapse/app/homeserver.py
parentOops, we do want to defer.return regardless of whether we are caching or not (diff)
parentMerge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-c86ebe76736a4cde48cfb3229d894a174c6bd379.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
Conflicts:
	synapse/app/homeserver.py
	synapse/state.py
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 3a128af5f7..2b17cae54f 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -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