OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Wrap process in a flag so we don't process whist already processing.

pull/705/head
David Baker 2016-04-07 17:31:08 +01:00
parent 6ec02e9ecf
commit 15e0f1696f
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
synapse/push/httppusher.py
View File

@ -48,6 +48,7 @@ class HttpPusher(object):
self.backoff_delay = HttpPusher.INITIAL_BACKOFF_SEC self.backoff_delay = HttpPusher.INITIAL_BACKOFF_SEC
self.failing_since = pusherdict['failing_since'] self.failing_since = pusherdict['failing_since']
self.timed_call = None self.timed_call = None
self.processing = False
# This is the highest stream ordering we know it's safe to process. # This is the highest stream ordering we know it's safe to process.
# When new events arrive, we'll be given a window of new events: we # When new events arrive, we'll be given a window of new events: we
@ -109,6 +110,14 @@ class HttpPusher(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def _process(self): def _process(self):
try:
self.processing = True
yield self._unsafe_process()
finally:
self.processing = False
@defer.inlineCallbacks
def _unsafe_process(self):
unprocessed = yield self.store.get_unread_push_actions_for_user_in_range( unprocessed = yield self.store.get_unread_push_actions_for_user_in_range(
self.user_id, self.last_stream_ordering, self.max_stream_ordering self.user_id, self.last_stream_ordering, self.max_stream_ordering
) )