summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-26 19:18:11 +0100
committerErik Johnston <erik@matrix.org>2014-08-26 19:18:11 +0100
commitc1cf0b334eaa6240ddc40f3a64119519b34ae213 (patch)
treebadd55a139b30b06871b3d15a2f1ca923c0b849d
parentMerge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff)
downloadsynapse-c1cf0b334eaa6240ddc40f3a64119519b34ae213.tar.xz
Fix exceptions so that the event stream works. Presence like events are turned off currently.
-rw-r--r--synapse/streams/events.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/streams/events.py b/synapse/streams/events.py

index 1d4467af44..887c792104 100644 --- a/synapse/streams/events.py +++ b/synapse/streams/events.py
@@ -20,7 +20,7 @@ from synapse.types import StreamToken class RoomEventSource(object): - SIGNAL_NAME = "EventStreamSourceSignal" + SIGNAL_NAME = "RoomEventSource" def __init__(self, hs): self.store = hs.get_datastore() @@ -74,6 +74,8 @@ class RoomEventSource(object): class PresenceStreamSource(object): + SIGNAL_NAME = "PresenceStreamSource" + def __init__(self, hs): self.hs = hs self.clock = hs.get_clock() @@ -105,7 +107,7 @@ class PresenceStreamSource(object): return (([], end_token)) def get_keys_for_user(self, user): - raise NotImplementedError("get_keys_for_user") + return defer.succeed([]) def get_current_token_part(self): presence = self.hs.get_handlers().presence_handler