tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

s/aquire/acquire/g

Browse source
This commit is contained in:
Mark Haines 2016-12-30 20:04:44 +00:00
parent 0aff09f6c9
commit 62ce3034f3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
synapse/federation/federation_server.py
View file

@ -539,12 +539,12 @@ class FederationServer(FederationBase):
# If we're missing stuff, ensure we only fetch stuff one # If we're missing stuff, ensure we only fetch stuff one
# at a time. # at a time.
logger.info( logger.info(
"Aquiring lock for room %r to fetch %d missing events: %r...", "Acquiring lock for room %r to fetch %d missing events: %r...",
pdu.room_id, len(prevs - seen), list(prevs - seen)[:5], pdu.room_id, len(prevs - seen), list(prevs - seen)[:5],
) )
with (yield self._room_pdu_linearizer.queue(pdu.room_id)): with (yield self._room_pdu_linearizer.queue(pdu.room_id)):
logger.info( logger.info(
"Aquired lock for room %r to fetch %d missing events", "Acquired lock for room %r to fetch %d missing events",
pdu.room_id, len(prevs - seen), pdu.room_id, len(prevs - seen),
) )

2
synapse/util/async.py
View file

@ -185,7 +185,7 @@ class Linearizer(object):
self.key_to_defer[key] = new_defer self.key_to_defer[key] = new_defer
if current_defer: if current_defer:
logger.info("Waiting to aquire linearizer lock for key %r", key) logger.info("Waiting to acquire linearizer lock for key %r", key)
with PreserveLoggingContext(): with PreserveLoggingContext():
yield current_defer yield current_defer