summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-09-28 12:45:54 +0100
committerRichard van der Hoff <richard@matrix.org>2018-09-28 12:45:54 +0100
commit965154d60af59b69eac01f7cfcf821a757ae93fa (patch)
tree9cfc60a534ffbe42e43d1f8abba20e3efc29fe12
parentchangelog (diff)
downloadsynapse-965154d60af59b69eac01f7cfcf821a757ae93fa.tar.xz
Fix complete fail to do the right thing
-rw-r--r--synapse/federation/transaction_queue.py3
-rw-r--r--synapse/handlers/typing.py1
2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py

index ae47aaae0b..98b5950800 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py
@@ -354,7 +354,7 @@ class TransactionQueue(object): content=content, ) - if not destination == self.server_name: + if destination == self.server_name: logger.info("Not sending EDU to ourselves") return @@ -372,6 +372,7 @@ class TransactionQueue(object): def send_device_messages(self, destination): if destination == self.server_name: logger.info("Not sending device update to ourselves") + return self._attempt_new_transaction(destination) diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py
index 2d2d3d5a0d..bf82b3f864 100644 --- a/synapse/handlers/typing.py +++ b/synapse/handlers/typing.py
@@ -218,6 +218,7 @@ class TypingHandler(object): for domain in set(get_domain_from_id(u) for u in users): if domain != self.server_name: + logger.debug("sending typing update to %s", domain) self.federation.send_edu( destination=domain, edu_type="m.typing",