Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-07-08 12:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop

Browse Source
This commit is contained in:
Erik Johnston 2015-02-17 15:18:17 +00:00
commit fa6c93bd26
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/federation/federation_server.py
View File

@ -124,7 +124,7 @@ class FederationServer(FederationBase):
edu.content edu.content
) )
results = yield defer.DeferredList(dl) results = yield defer.DeferredList(dl, consumeErrors=True)
ret = [] ret = []
for r in results: for r in results:

2
synapse/federation/transaction_queue.py
View File

@ -98,7 +98,7 @@ class TransactionQueue(object):
deferreds.append(deferred) deferreds.append(deferred)
yield defer.DeferredList(deferreds) yield defer.DeferredList(deferreds, consumeErrors=True)
# NO inlineCallbacks # NO inlineCallbacks
def enqueue_edu(self, edu): def enqueue_edu(self, edu):

8
synapse/handlers/presence.py
View File

@ -492,7 +492,7 @@ class PresenceHandler(BaseHandler):
user, domain, remoteusers user, domain, remoteusers
)) ))
yield defer.DeferredList(deferreds) yield defer.DeferredList(deferreds, consumeErrors=True)
def _start_polling_local(self, user, target_user): def _start_polling_local(self, user, target_user):
target_localpart = target_user.localpart target_localpart = target_user.localpart
@ -548,7 +548,7 @@ class PresenceHandler(BaseHandler):
self._stop_polling_remote(user, domain, remoteusers) self._stop_polling_remote(user, domain, remoteusers)
) )
return defer.DeferredList(deferreds) return defer.DeferredList(deferreds, consumeErrors=True)
def _stop_polling_local(self, user, target_user): def _stop_polling_local(self, user, target_user):
for localpart in self._local_pushmap.keys(): for localpart in self._local_pushmap.keys():
@ -729,7 +729,7 @@ class PresenceHandler(BaseHandler):
del self._remote_sendmap[user] del self._remote_sendmap[user]
with PreserveLoggingContext(): with PreserveLoggingContext():
yield defer.DeferredList(deferreds) yield defer.DeferredList(deferreds, consumeErrors=True)
@defer.inlineCallbacks @defer.inlineCallbacks
def push_update_to_local_and_remote(self, observed_user, statuscache, def push_update_to_local_and_remote(self, observed_user, statuscache,
@ -768,7 +768,7 @@ class PresenceHandler(BaseHandler):
) )
) )
yield defer.DeferredList(deferreds) yield defer.DeferredList(deferreds, consumeErrors=True)
defer.returnValue((localusers, remote_domains)) defer.returnValue((localusers, remote_domains))

2
synapse/handlers/typing.py
View File

@ -181,7 +181,7 @@ class TypingNotificationHandler(BaseHandler):
}, },
)) ))
yield defer.DeferredList(deferreds, consumeErrors=False) yield defer.DeferredList(deferreds, consumeErrors=True)
@defer.inlineCallbacks @defer.inlineCallbacks
def _recv_edu(self, origin, content): def _recv_edu(self, origin, content):

6
synapse/notifier.py
View File

@ -141,7 +141,8 @@ class Notifier(object):
with PreserveLoggingContext(): with PreserveLoggingContext():
yield defer.DeferredList( yield defer.DeferredList(
[notify(l).addErrback(eb) for l in listeners] [notify(l).addErrback(eb) for l in listeners],
consumeErrors=True,
) )
@defer.inlineCallbacks @defer.inlineCallbacks
@ -209,7 +210,8 @@ class Notifier(object):
with PreserveLoggingContext(): with PreserveLoggingContext():
yield defer.DeferredList( yield defer.DeferredList(
[notify(l).addErrback(eb) for l in listeners] [notify(l).addErrback(eb) for l in listeners],
consumeErrors=True,
) )
@defer.inlineCallbacks @defer.inlineCallbacks

2
synapse/storage/roommember.py
View File

@ -288,7 +288,7 @@ class RoomMemberStore(SQLBaseStore):
deferreds = [self.get_rooms_for_user(u) for u in user_id_list] deferreds = [self.get_rooms_for_user(u) for u in user_id_list]
results = yield defer.DeferredList(deferreds) results = yield defer.DeferredList(deferreds, consumeErrors=True)
# A list of sets of strings giving room IDs for each user # A list of sets of strings giving room IDs for each user
room_id_lists = [set([r.room_id for r in result[1]]) for result in results] room_id_lists = [set([r.room_id for r in result[1]]) for result in results]