diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-09 17:13:30 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-09 17:13:30 +0100 |
| commit | 327425764e44ea299ea4d85859035f3052c7b8b1 (patch) | |
| tree | dac530db7d0cca5fd8e5128eac61a8266872603b | |
| parent | Clobber EDUs in send queue (diff) | |
| download | synapse-327425764e44ea299ea4d85859035f3052c7b8b1.tar.xz | |
Add edu.type as part of key. Remove debug logging
| -rw-r--r-- | synapse/federation/transaction_queue.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index bd2a04af9e..4f8315e59d 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -154,7 +154,9 @@ class TransactionQueue(object): return if key: - self.pending_edus_keyed_by_dest.setdefault(destination, {})[key] = edu + self.pending_edus_keyed_by_dest.setdefault( + destination, {} + )[(edu.type, key)] = edu else: self.pending_edus_by_dest.setdefault(destination, []).append(edu) @@ -228,7 +230,6 @@ class TransactionQueue(object): ) pending_edus.extend(device_message_edus) - logger.info("Sending presence: %r", pending_presence) if pending_presence: pending_edus.append( Edu( |