Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix start_pushers vs _start_pushers confusion

This commit is contained in:
Richard van der Hoff 2018-10-24 09:24:55 +01:00
parent e564306e31
commit c573794b22
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/push/pusherpool.py
View File

@ -41,7 +41,7 @@ class PusherPool:
def __init__(self, _hs): def __init__(self, _hs):
self.hs = _hs self.hs = _hs
self.pusher_factory = PusherFactory(_hs) self.pusher_factory = PusherFactory(_hs)
self.start_pushers = _hs.config.start_pushers self._should_start_pushers = _hs.config.start_pushers
self.store = self.hs.get_datastore() self.store = self.hs.get_datastore()
self.clock = self.hs.get_clock() self.clock = self.hs.get_clock()
self.pushers = {} self.pushers = {}
@ -49,7 +49,7 @@ class PusherPool:
def start(self): def start(self):
"""Starts the pushers off in a background process. """Starts the pushers off in a background process.
""" """
if not self.start_pushers: if not self._should_start_pushers:
logger.info("Not starting pushers because they are disabled in the config") logger.info("Not starting pushers because they are disabled in the config")
return return
run_as_background_process("start_pushers", self._start_pushers) run_as_background_process("start_pushers", self._start_pushers)
@ -175,7 +175,7 @@ class PusherPool:
@defer.inlineCallbacks @defer.inlineCallbacks
def start_pusher_by_id(self, app_id, pushkey, user_id): def start_pusher_by_id(self, app_id, pushkey, user_id):
"""Look up the details for the given pusher, and start it""" """Look up the details for the given pusher, and start it"""
if not self._start_pushers: if not self._should_start_pushers:
return return
resultlist = yield self.store.get_pushers_by_app_id_and_pushkey( resultlist = yield self.store.get_pushers_by_app_id_and_pushkey(