summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-12-30 20:04:44 +0000
committerMark Haines <mark.haines@matrix.org>2016-12-30 20:04:44 +0000
commit62ce3034f3096d7a7e920200d2a7cbd5534f655b (patch)
tree0bafdba6cf08770fe1aa5d705210fad7d2a78452 /synapse
parentAdd more useful logging when we block fetching events (diff)
downloadsynapse-62ce3034f3096d7a7e920200d2a7cbd5534f655b.tar.xz
s/aquire/acquire/g
Diffstat (limited to 'synapse')
-rw-r--r--synapse/federation/federation_server.py4
-rw-r--r--synapse/util/async.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py

index 6e600fcb89..f4c60e67e3 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py
@@ -539,12 +539,12 @@ class FederationServer(FederationBase): # If we're missing stuff, ensure we only fetch stuff one # at a time. 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], ) with (yield self._room_pdu_linearizer.queue(pdu.room_id)): 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), ) diff --git a/synapse/util/async.py b/synapse/util/async.py
index 1e124163fa..4280455cbe 100644 --- a/synapse/util/async.py +++ b/synapse/util/async.py
@@ -185,7 +185,7 @@ class Linearizer(object): self.key_to_defer[key] = new_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(): yield current_defer