summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-25 11:13:54 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-25 11:13:54 +0200
commit1bd380c816493ffdd2c2a7a6463b1ef48c1bfcab (patch)
tree92d4bb31a1372239e317f8672d6b80e59b709523 /synapse/handlers
parentOops. Removed my NetBeans private folders (diff)
parentFor the content repo, don't just use homeserver.hostname as that might not in... (diff)
downloadsynapse-1bd380c816493ffdd2c2a7a6463b1ef48c1bfcab.tar.xz
Merge remote-tracking branch 'origin/hotfixes-0.0.1' into develop
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/presence.py8
-rw-r--r--synapse/handlers/room.py2
2 files changed, 9 insertions, 1 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 540e114b82..c88cc18788 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -142,6 +142,10 @@ class PresenceHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def is_presence_visible(self, observer_user, observed_user):
+        defer.returnValue(True)
+        return
+        # FIXME (erikj): This code path absolutely kills the database.
+
         assert(observed_user.is_mine)
 
         if observer_user == observed_user:
@@ -187,6 +191,10 @@ class PresenceHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def set_state(self, target_user, auth_user, state):
+        return
+        # TODO (erikj): Turn this back on. Why did we end up sending EDUs
+        # everywhere?
+
         if not target_user.is_mine:
             raise SynapseError(400, "User is not hosted on this Home Server")
 
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 899b653fb7..8ab0b8033e 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -307,7 +307,7 @@ class MessageHandler(BaseHandler):
 
         ret = {"rooms": rooms_ret, "presence": presence[0], "end": now_token}
 
-        logger.debug("snapshot_all_rooms returning: %s", ret)
+        # logger.debug("snapshot_all_rooms returning: %s", ret)
 
         defer.returnValue(ret)