lnbits-exts/nostrclient
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: thread not dead

Browse source
This commit is contained in:
Vlad Stan 2023-07-05 09:09:10 +03:00
parent 3b08714a84
commit 403c8f1b05
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nostr/relay.py
View file

@ -102,12 +102,14 @@ class Relay:
message = self.queue.get(timeout=1) message = self.queue.get(timeout=1)
self.num_sent_events += 1 self.num_sent_events += 1
self.ws.send(message) self.ws.send(message)
except Exception as e: except:
if self.shutdown: pass
logger.warning(f"Closing queue worker for '{self.url}'.")
break
else: else:
time.sleep(0.1) time.sleep(0.1)
if self.shutdown:
logger.warning(f"Closing queue worker for '{self.url}'.")
break
def add_subscription(self, id, filters: Filters): def add_subscription(self, id, filters: Filters):
with self.lock: with self.lock:

9
nostr/relay_manager.py
View file

@ -44,12 +44,13 @@ class RelayManager:
return relay return relay
def remove_relay(self, url: str): def remove_relay(self, url: str):
self.threads[url].join(timeout=1)
self.threads.pop(url)
self.queue_threads[url].join(timeout=1)
self.queue_threads.pop(url)
self.relays[url].close() self.relays[url].close()
self.relays.pop(url) self.relays.pop(url)
self.threads[url].join(timeout=5)
self.threads.pop(url)
self.queue_threads[url].join(timeout=5)
self.queue_threads.pop(url)
def add_subscription(self, id: str, filters: Filters): def add_subscription(self, id: str, filters: Filters):
with self._subscriptions_lock: with self._subscriptions_lock: