summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-22 18:23:02 +0100
committerErik Johnston <erik@matrix.org>2014-08-22 18:23:02 +0100
commitcda4ff85198fd68ba10905e90f3e7172fe24559b (patch)
treeb7c11f85b70c9f45a442b830e19a887d7af433e4 /synapse/handlers
parentMake is_presence_visible always return true as it was thrashing the database. (diff)
downloadsynapse-cda4ff85198fd68ba10905e90f3e7172fe24559b.tar.xz
Oops, we need to use defer.returnValue.
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/presence.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index bccb24a109..c88cc18788 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -142,7 +142,8 @@ class PresenceHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def is_presence_visible(self, observer_user, observed_user):
-        return defer.succeed(True)
+        defer.returnValue(True)
+        return
         # FIXME (erikj): This code path absolutely kills the database.
 
         assert(observed_user.is_mine)