summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-29 14:55:27 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-29 14:55:27 +0000
commit9d8f798a3fa0a0a98626218ff1602bf06be0fb82 (patch)
tree7226008bc691b4599c2c499de63c4bbced486a1b /synapse/app
parentMove bump schema delta (diff)
parentSYN-252: Supply the stream and topological parts in the correct order to the ... (diff)
downloadsynapse-9d8f798a3fa0a0a98626218ff1602bf06be0fb82.tar.xz
Merge changes from develop
Diffstat (limited to 'synapse/app')
-rwxr-xr-xsynapse/app/homeserver.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 40d28dcbdc..f20ccfb5b6 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -272,6 +272,8 @@ def setup():
         bind_port = None
     hs.start_listening(bind_port, config.unsecure_port)
 
+    hs.get_pusherpool().start()
+
     if config.daemonize:
         print config.pid_file
         daemon = Daemonize(