diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-16 13:41:21 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-16 14:47:52 +0000 |
| commit | daec6fc355517b70c159526e20e739fa09c8e443 (patch) | |
| tree | 7778bc3b71afdcef92f40a9c06b6429143b09385 /synapse/federation/federation_client.py | |
| parent | Rename transaction queue functions to send_* (diff) | |
| download | synapse-daec6fc355517b70c159526e20e739fa09c8e443.tar.xz | |
Move logic into transaction_queue
Diffstat (limited to 'synapse/federation/federation_client.py')
| -rw-r--r-- | synapse/federation/federation_client.py | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index 783ccf12f6..9c69fe511c 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -106,15 +106,12 @@ class FederationClient(FederationBase): Deferred: Completes when we have successfully processed the PDU and replicated it to any interested remote home servers. """ - order = self._order - self._order += 1 - sent_pdus_destination_dist.inc_by(len(destinations)) logger.debug("[%s] transaction_layer.send_pdu... ", pdu.event_id) # TODO, add errback, etc. - self._transaction_queue.send_pdu(pdu, destinations, order) + self._transaction_queue.send_pdu(pdu, destinations) logger.debug( "[%s] transaction_layer.send_pdu... done", @@ -127,16 +124,7 @@ class FederationClient(FederationBase): @log_function def send_edu(self, destination, edu_type, content, key=None): - edu = Edu( - origin=self.server_name, - destination=destination, - edu_type=edu_type, - content=content, - ) - - sent_edus_counter.inc() - - self._transaction_queue.send_edu(edu, key=key) + self._transaction_queue.send_edu(destination, edu_type, content, key=key) @log_function def send_device_messages(self, destination): |