Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup

2016-01-27 17:37:33 +00:00 · 2016-01-27 17:37:33 +00:00 · fa90c180ee
parent 0487c9441f 5610880003
commit fa90c180ee
1 changed files with 1 additions and 1 deletions
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@ -651,7 +651,7 @@ def _resource_id(resource, path_seg):


 def run(hs):
-    PROFILE_SYNAPSE = True
+    PROFILE_SYNAPSE = False
    if PROFILE_SYNAPSE:
        def profile(func):
            from cProfile import Profile