Git-Mirrors/LXMF
1
0
Fork 0
mirror of https://github.com/markqvist/LXMF.git synced 2025-08-03 12:26:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved outbound handling

Browse source
This commit is contained in:
Mark Qvist 2024-09-17 13:29:36 +02:00
parent e1a56be5c1
commit ef1c3331ad
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
LXMF/LXMRouter.py
View file

@ -1236,6 +1236,7 @@ class LXMRouter:
if not RNS.Transport.has_path(destination_hash) and lxmessage.method == LXMessage.OPPORTUNISTIC: if not RNS.Transport.has_path(destination_hash) and lxmessage.method == LXMessage.OPPORTUNISTIC:
RNS.log(f"Pre-emptively requesting unknown path for opportunistic {lxmessage}", RNS.LOG_DEBUG) RNS.log(f"Pre-emptively requesting unknown path for opportunistic {lxmessage}", RNS.LOG_DEBUG)
RNS.Transport.request_path(destination_hash) RNS.Transport.request_path(destination_hash)
lxmessage.next_delivery_attempt = time.time() + LXMRouter.PATH_REQUEST_WAIT
unknown_path_requested = True unknown_path_requested = True
lxmessage.determine_transport_encryption() lxmessage.determine_transport_encryption()
@ -1245,11 +1246,13 @@ class LXMRouter:
lxmessage.defer_stamp = False lxmessage.defer_stamp = False
if not lxmessage.defer_stamp: if not lxmessage.defer_stamp:
while not unknown_path_requested and self.processing_outbound:
time.sleep(0.05)
self.pending_outbound.append(lxmessage) self.pending_outbound.append(lxmessage)
if not unknown_path_requested: if not unknown_path_requested:
while self.processing_outbound:
time.sleep(0.05)
self.process_outbound() self.process_outbound()
else: else:
self.pending_deferred_stamps[lxmessage.message_id] = lxmessage self.pending_deferred_stamps[lxmessage.message_id] = lxmessage
@ -1786,6 +1789,7 @@ class LXMRouter:
elif lxmessage.method == LXMessage.PROPAGATED and lxmessage.state == LXMessage.SENT: elif lxmessage.method == LXMessage.PROPAGATED and lxmessage.state == LXMessage.SENT:
RNS.log("Propagation has occurred for "+str(lxmessage)+", removing from outbound queue", RNS.LOG_DEBUG) RNS.log("Propagation has occurred for "+str(lxmessage)+", removing from outbound queue", RNS.LOG_DEBUG)
self.pending_outbound.remove(lxmessage) self.pending_outbound.remove(lxmessage)
else: else:
RNS.log("Starting outbound processing for "+str(lxmessage)+" to "+RNS.prettyhexrep(lxmessage.get_destination().hash), RNS.LOG_DEBUG) RNS.log("Starting outbound processing for "+str(lxmessage)+" to "+RNS.prettyhexrep(lxmessage.get_destination().hash), RNS.LOG_DEBUG)