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

Don't keep links alive after sync

Browse Source
This commit is contained in:
Mark Qvist 2024-02-29 20:12:54 +01:00
parent c369c6fc26
commit 35dc771528
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
LXMF/LXMPeer.py
View File

@ -224,6 +224,10 @@ class LXMPeer:
self.state = LXMPeer.RESOURCE_TRANSFERRING self.state = LXMPeer.RESOURCE_TRANSFERRING
else: else:
RNS.log("Peer "+RNS.prettyhexrep(self.destination_hash)+" did not request any of the available messages, sync completed", RNS.LOG_DEBUG) RNS.log("Peer "+RNS.prettyhexrep(self.destination_hash)+" did not request any of the available messages, sync completed", RNS.LOG_DEBUG)
if self.link != None:
self.link.teardown()
self.link = None
self.state = LXMPeer.IDLE self.state = LXMPeer.IDLE
except Exception as e: except Exception as e:
@ -236,25 +240,28 @@ class LXMPeer:
self.link = None self.link = None
self.state = LXMPeer.IDLE self.state = LXMPeer.IDLE
def resource_concluded(self, resource): def resource_concluded(self, resource):
if resource.status == RNS.Resource.COMPLETE: if resource.status == RNS.Resource.COMPLETE:
for transient_id in resource.transferred_messages: for transient_id in resource.transferred_messages:
message = self.unhandled_messages.pop(transient_id) message = self.unhandled_messages.pop(transient_id)
self.handled_messages[transient_id] = message self.handled_messages[transient_id] = message
if self.link != None:
self.link.teardown()
self.link = None
self.state = LXMPeer.IDLE self.state = LXMPeer.IDLE
self.link.teardown()
RNS.log("Sync to peer "+RNS.prettyhexrep(self.destination_hash)+" completed", RNS.LOG_DEBUG) RNS.log("Sync to peer "+RNS.prettyhexrep(self.destination_hash)+" completed", RNS.LOG_DEBUG)
self.alive = True self.alive = True
self.last_heard = time.time() self.last_heard = time.time()
else: else:
RNS.log("Resource transfer for LXMF peer sync failed to "+str(self.destination), RNS.LOG_DEBUG) RNS.log("Resource transfer for LXMF peer sync failed to "+str(self.destination), RNS.LOG_DEBUG)
if self.link != None: if self.link != None:
self.link.teardown() self.link.teardown()
else:
self.state = LXMPeer.IDLE
self.state = LXMPeer.IDLE
def link_established(self, link): def link_established(self, link):
self.link.identify(self.router.identity) self.link.identify(self.router.identity)
@ -272,8 +279,6 @@ class LXMPeer:
def handle_message(self, transient_id): def handle_message(self, transient_id):
if not transient_id in self.handled_messages and not transient_id in self.unhandled_messages: if not transient_id in self.handled_messages and not transient_id in self.unhandled_messages:
# TODO: Remove at some point
RNS.log("The message "+RNS.prettyhexrep(transient_id)+" was added to distribution queue for "+RNS.prettyhexrep(self.destination_hash), RNS.LOG_EXTREME)
self.unhandled_messages[transient_id] = self.router.propagation_entries[transient_id] self.unhandled_messages[transient_id] = self.router.propagation_entries[transient_id]
def __str__(self): def __str__(self):

3
LXMF/LXMRouter.py
View File

@ -653,7 +653,8 @@ class LXMRouter:
job_thread.start() job_thread.start()
def __request_messages_path_job(self): def __request_messages_path_job(self):
while not RNS.Transport.has_path(self.wants_download_on_path_available_from) and time.time() < self.wants_download_on_path_available_timeout: path_timeout = self.wants_download_on_path_available_timeout
while not RNS.Transport.has_path(self.wants_download_on_path_available_from) and time.time() < path_timeout:
time.sleep(0.1) time.sleep(0.1)
if RNS.Transport.has_path(self.wants_download_on_path_available_from): if RNS.Transport.has_path(self.wants_download_on_path_available_from):