mirror of
https://github.com/chatmail/core.git
synced 2026-05-08 09:26:29 +03:00
fix: acquire write lock on iroh_channels before checking for subscribe_loop
This commit is contained in:
@@ -80,7 +80,14 @@ impl Iroh {
|
|||||||
msg_id: MsgId,
|
msg_id: MsgId,
|
||||||
) -> Result<Option<JoinTopicFut>> {
|
) -> Result<Option<JoinTopicFut>> {
|
||||||
let topic = get_iroh_topic_for_msg(ctx, msg_id).await?;
|
let topic = get_iroh_topic_for_msg(ctx, msg_id).await?;
|
||||||
let seq = if let Some(channel_state) = self.iroh_channels.read().await.get(&topic) {
|
|
||||||
|
// Take exclusive lock to make sure
|
||||||
|
// no other thread can create a second gossip subscription
|
||||||
|
// after we check that it does not exist and before we create a new one.
|
||||||
|
// Otherwise we would receive every message twice or more times.
|
||||||
|
let mut iroh_channels = self.iroh_channels.write().await;
|
||||||
|
|
||||||
|
let seq = if let Some(channel_state) = iroh_channels.get(&topic) {
|
||||||
if channel_state.subscribe_loop.is_some() {
|
if channel_state.subscribe_loop.is_some() {
|
||||||
return Ok(None);
|
return Ok(None);
|
||||||
}
|
}
|
||||||
@@ -114,10 +121,7 @@ impl Iroh {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
self.iroh_channels
|
iroh_channels.insert(topic, ChannelState::new(seq, subscribe_loop));
|
||||||
.write()
|
|
||||||
.await
|
|
||||||
.insert(topic, ChannelState::new(seq, subscribe_loop));
|
|
||||||
|
|
||||||
Ok(Some(connect_future))
|
Ok(Some(connect_future))
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user