summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-27 17:15:58 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-27 17:15:58 +0100
commit2aeaa7b77c0c39f12c89b0054049970faad28406 (patch)
treef3022ab73ea75827dfec17de532fb07b0949196f /synapse/server.py
parentReturn the store_id from persist_event (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-2aeaa7b77c0c39f12c89b0054049970faad28406.tar.xz
Merge branch 'develop' into storage_transactions
Conflicts:
	synapse/handlers/room.py
	synapse/storage/stream.py
Diffstat (limited to '')
-rw-r--r--synapse/server.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/server.py b/synapse/server.py
index 94facf9d99..ade8dc6c15 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -21,7 +21,7 @@
 # Imports required for the default HomeServer() implementation
 from synapse.federation import initialize_http_replication
 from synapse.api.events.factory import EventFactory
-from synapse.api.notifier import Notifier
+from synapse.notifier import Notifier
 from synapse.api.auth import Auth
 from synapse.handlers import Handlers
 from synapse.rest import RestServletFactory
@@ -31,6 +31,7 @@ from synapse.types import UserID, RoomAlias, RoomID
 from synapse.util import Clock
 from synapse.util.distributor import Distributor
 from synapse.util.lockutils import LockManager
+from synapse.streams.events import EventSources
 
 
 class BaseHomeServer(object):
@@ -71,6 +72,7 @@ class BaseHomeServer(object):
         'resource_for_federation',
         'resource_for_web_client',
         'resource_for_content_repo',
+        'event_sources',
     ]
 
     def __init__(self, hostname, **kwargs):
@@ -190,6 +192,9 @@ class HomeServer(BaseHomeServer):
     def build_distributor(self):
         return Distributor()
 
+    def build_event_sources(self):
+        return EventSources(self)
+
     def register_servlets(self):
         """ Register all servlets associated with this HomeServer.
         """