leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

external_peer_adder now dies

Browse source
This commit is contained in:
Igor Katson 2023-12-02 14:57:00 +00:00
parent a2bb1220a9
commit 98d487a5af
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
1 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/librqbit/src/torrent_state/mod.rs
View file

@ -24,12 +24,12 @@ use librqbit_core::torrent_metainfo::TorrentMetaV1Info;
pub use live::*; pub use live::*;
use parking_lot::RwLock; use parking_lot::RwLock;
use tokio::time::timeout;
use tokio_stream::StreamExt; use tokio_stream::StreamExt;
use tracing::debug; use tracing::debug;
use tracing::error;
use tracing::error_span; use tracing::error_span;
use tracing::warn;
use tracing::trace; use tracing::trace;
use tracing::warn;
use url::Url; use url::Url;
use crate::chunk_tracker::ChunkTracker; use crate::chunk_tracker::ChunkTracker;
@ -214,19 +214,27 @@ impl ManagedTorrent {
} }
} }
if let Some(mut peer_rx) = peer_rx { let mut peer_rx = if let Some(peer_rx) = peer_rx {
while let Some(peer) = peer_rx.next().await { peer_rx
let live = match live.upgrade() {
Some(live) => live,
None => return Ok(()),
};
live.add_peer_if_not_seen(peer).context("torrent closed")?;
}
} else { } else {
error!("peer rx is not set"); return Ok(());
} };
Ok(()) loop {
match timeout(Duration::from_secs(5), peer_rx.next()).await {
Ok(Some(peer)) => {
let live = match live.upgrade() {
Some(live) => live,
None => return Ok(()),
};
live.add_peer_if_not_seen(peer).context("torrent closed")?;
}
Ok(None) => return Ok(()),
// If timeout, check if the torrent is live.
Err(_) if live.strong_count() == 0 => return Ok(()),
Err(_) => continue,
}
}
}, },
); );
} }