Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-26 10:59:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Log contexts and squash things together

Browse Source
This commit is contained in:
Erik Johnston 2016-04-07 15:29:34 +01:00
parent 639cd07d6d
commit ee5aef6c72
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
synapse/util/async.py
View File

@ -16,7 +16,9 @@
from twisted.internet import defer, reactor from twisted.internet import defer, reactor
from .logcontext import PreserveLoggingContext, preserve_fn from .logcontext import (
PreserveLoggingContext, preserve_fn, preserve_context_over_deferred,
)
from synapse.util import unwrapFirstError from synapse.util import unwrapFirstError
from contextlib import contextmanager from contextlib import contextmanager
@ -141,14 +143,6 @@ def concurrently_execute(func, args, limit):
], consumeErrors=True).addErrback(unwrapFirstError) ], consumeErrors=True).addErrback(unwrapFirstError)
@contextmanager
def _trigger_defer_manager(d):
try:
yield
finally:
d.callback(None)
class Linearizer(object): class Linearizer(object):
"""Linearizes access to resources based on a key. Useful to ensure only one """Linearizes access to resources based on a key. Useful to ensure only one
thing is happening at a time on a given resource. thing is happening at a time on a given resource.
@ -177,13 +171,17 @@ class Linearizer(object):
new_defer = defer.Deferred() new_defer = defer.Deferred()
self.key_to_defer[key] = new_defer self.key_to_defer[key] = new_defer
def remove_if_current(_): if current_defer:
yield preserve_context_over_deferred(current_defer)
@contextmanager
def _ctx_manager(d):
try:
yield
finally:
d.callback(None)
d = self.key_to_defer.get(key) d = self.key_to_defer.get(key)
if d is new_defer: if d is new_defer:
self.key_to_defer.pop(key, None) self.key_to_defer.pop(key, None)
new_defer.addBoth(remove_if_current) defer.returnValue(_ctx_manager(new_defer))
yield current_defer
defer.returnValue(_trigger_defer_manager(new_defer))