Git-Mirrors/LXMF
1
0
Fork 0
mirror of https://github.com/markqvist/LXMF.git synced 2025-02-05 09:55:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Message fail callback

Browse Source
This commit is contained in:
Mark Qvist 2021-05-14 13:25:06 +02:00
parent da0ba60b71
commit e069713226
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
LXMF/LXMF.py
View File

@ -263,7 +263,7 @@ class LXMessage:
if self.__delivery_callback != None: if self.__delivery_callback != None:
self.__delivery_callback(self) self.__delivery_callback(self)
def __mark_failed(self, receipt = None): def _LXMRouter__mark_failed(self, receipt = None):
RNS.log(str(self)+" failed to send", RNS.LOG_DEBUG) RNS.log(str(self)+" failed to send", RNS.LOG_DEBUG)
self.state = LXMessage.FAILED self.state = LXMessage.FAILED
@ -548,6 +548,11 @@ class LXMRouter:
self.direct_links.pop(link_hash) self.direct_links.pop(link_hash)
RNS.log("Removed "+RNS.hexrep(link_hash, delimit=False)+" from direct link list, since it was closed") RNS.log("Removed "+RNS.hexrep(link_hash, delimit=False)+" from direct link list, since it was closed")
def fail_message(self, lxmessage):
self.pending_outbound.remove(lxmessage)
self.failed_outbound.append(lxmessage)
lxmessage.__mark_failed()
def process_outbound(self, sender = None): def process_outbound(self, sender = None):
if self.processing_outbound: if self.processing_outbound:
return return
@ -560,21 +565,20 @@ class LXMRouter:
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)
# Outbound handling for opportunistic messages # Outbound handling for opportunistic messages
if lxmessage.method == LXMessage.OPPORTUNISTIC: if lxmessage.method == LXMessage.OPPORTUNISTIC:
if lxmessage.delivery_attempts < LXMRouter.MAX_DELIVERY_ATTEMPTS: if lxmessage.delivery_attempts <= LXMRouter.MAX_DELIVERY_ATTEMPTS:
if not hasattr(lxmessage, "next_delivery_attempt") or time.time() > lxmessage.next_delivery_attempt: if not hasattr(lxmessage, "next_delivery_attempt") or time.time() > lxmessage.next_delivery_attempt:
lxmessage.delivery_attempts += 1 lxmessage.delivery_attempts += 1
lxmessage.next_delivery_attempt = time.time() + LXMRouter.DELIVERY_RETRY_WAIT lxmessage.next_delivery_attempt = time.time() + LXMRouter.DELIVERY_RETRY_WAIT
RNS.log("Opportunistic delivery attempt "+str(lxmessage.delivery_attempts)+" for "+str(lxmessage)+" to "+RNS.prettyhexrep(lxmessage.get_destination().hash), RNS.LOG_DEBUG) RNS.log("Opportunistic delivery attempt "+str(lxmessage.delivery_attempts)+" for "+str(lxmessage)+" to "+RNS.prettyhexrep(lxmessage.get_destination().hash), RNS.LOG_DEBUG)
lxmessage.send() lxmessage.send()
else: else:
RNS.log("Max delivery attempts reached for "+str(lxmessage)+" to "+RNS.prettyhexrep(lxmessage.get_destination().hash), RNS.LOG_DEBUG) RNS.log("Max delivery attempts reached for oppertunistic "+str(lxmessage)+" to "+RNS.prettyhexrep(lxmessage.get_destination().hash), RNS.LOG_DEBUG)
self.pending_outbound.remove(lxmessage) self.fail_message(lxmessage)
self.failed_outbound.append(lxmessage)
# Outbound handling for messages transferred # Outbound handling for messages transferred
# over a direct link to the final recipient # over a direct link to the final recipient
elif lxmessage.method == LXMessage.DIRECT: elif lxmessage.method == LXMessage.DIRECT:
if lxmessage.delivery_attempts < LXMRouter.MAX_DELIVERY_ATTEMPTS: if lxmessage.delivery_attempts <= LXMRouter.MAX_DELIVERY_ATTEMPTS:
delivery_destination_hash = lxmessage.get_destination().hash delivery_destination_hash = lxmessage.get_destination().hash
if delivery_destination_hash in self.direct_links: if delivery_destination_hash in self.direct_links:
@ -610,9 +614,8 @@ class LXMRouter:
delivery_link.link_established_callback(self.process_outbound) delivery_link.link_established_callback(self.process_outbound)
self.direct_links[delivery_destination_hash] = delivery_link self.direct_links[delivery_destination_hash] = delivery_link
else: else:
RNS.log("Max delivery attempts reached for "+str(lxmessage)+" to "+RNS.prettyhexrep(lxmessage.get_destination().hash), RNS.LOG_DEBUG) RNS.log("Max delivery attempts reached for direct "+str(lxmessage)+" to "+RNS.prettyhexrep(lxmessage.get_destination().hash), RNS.LOG_DEBUG)
self.pending_outbound.remove(lxmessage) self.fail_message(lxmessage)
self.failed_outbound.append(lxmessage)
# Outbound handling for messages transported via # Outbound handling for messages transported via
# propagation to a LXMF router network. # propagation to a LXMF router network.