Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 22:14:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge changes from develop

Browse source
This commit is contained in:
Mark Haines 2015-01-29 14:55:27 +00:00
commit 9d8f798a3f
42 changed files with 2034 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/server.py
View file

@ -31,6 +31,7 @@ from synapse.util.lockutils import LockManager
from synapse.streams.events import EventSources
from synapse.api.ratelimiting import Ratelimiter
from synapse.crypto.keyring import Keyring
from synapse.push.pusherpool import PusherPool
from synapse.events.builder import EventBuilderFactory
from synapse.api.filtering import Filtering
@ -79,6 +80,7 @@ class BaseHomeServer(object):
'event_sources',
'ratelimiter',
'keyring',
'pusherpool',
'event_builder_factory',
'filtering',
]
@ -202,3 +204,6 @@ class HomeServer(BaseHomeServer):
def build_filtering(self):
return Filtering(self)
def build_pusherpool(self):
return PusherPool(self)