summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-09 15:01:26 +0000
committerErik Johnston <erik@matrix.org>2015-02-09 15:01:26 +0000
commit76c5a5c2f67bc24af553e78f83a85ef7d1906921 (patch)
tree42de17e8d55a5aa48ff3b43462f54569a221010e /synapse/app/homeserver.py
parentFix server default rule injection (downwards, not upwards!) (diff)
parentFix typo (diff)
downloadsynapse-76c5a5c2f67bc24af553e78f83a85ef7d1906921.tar.xz
Merge pull request #55 from matrix-org/profiling
Profiling
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index f20ccfb5b6..8976ff2e82 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__)
@@ -274,6 +274,8 @@ def setup():
 
     hs.get_pusherpool().start()
 
+    hs.get_datastore().start_profiling()
+
     if config.daemonize:
         print config.pid_file
         daemon = Daemonize(