nikita
/
lavina
forked from lavina/lavina
1
0
Fork 0
Code Pull Requests Activity

wip

This commit is contained in:
Nikita Vilunov 2023-12-18 16:49:41 +01:00
parent 59ff6060c5
commit cfa1e051fb
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/lavina-core/src/clustering/mod.rs
View File

@ -6,7 +6,7 @@ use prost::Message;
use serde::Deserialize; use serde::Deserialize;
use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio::io::{AsyncReadExt, AsyncWriteExt};
use tokio::net::{TcpListener, TcpStream}; use tokio::net::{TcpListener, TcpStream};
use tokio::spawn; use tokio::{select, pin, spawn};
use tokio::sync::mpsc::{channel, Receiver, Sender}; use tokio::sync::mpsc::{channel, Receiver, Sender};
use tokio::sync::RwLock; use tokio::sync::RwLock;
use tokio::task::JoinHandle; use tokio::task::JoinHandle;
@ -75,7 +75,7 @@ impl ClusterRegistry {
let handshake_response = read_message::<proto::HandshakeResponse>(&mut stream).await?; let handshake_response = read_message::<proto::HandshakeResponse>(&mut stream).await?;
info!("Connection to the bootstrap server succeeded"); info!("Connection to the bootstrap server succeeded");
peer_launch(stream , inner.clone()).await; peer_launch(stream, inner.clone()).await;
} }
Ok(ClusterRegistry { Ok(ClusterRegistry {
@ -93,16 +93,19 @@ impl ClusterRegistry {
if let Err(e) = k.send(PeerMsg::Close).await { if let Err(e) = k.send(PeerMsg::Close).await {
warn!("Failed to stop peer actor"); warn!("Failed to stop peer actor");
} }
} }
Ok(()) Ok(())
} }
} }
async fn start_connection_listener(listener: TcpListener, cluster: Arc<RwLock<ClusterRegistryInner>>) -> Terminator { async fn start_connection_listener(listener: TcpListener, cluster: Arc<RwLock<ClusterRegistryInner>>) -> Terminator {
Terminator::spawn(|_| async move { Terminator::spawn(|terminator| async move {
pin!(terminator);
loop { loop {
let (mut stream, addr) = match listener.accept().await { select! {
_ = &mut terminator => break,
res = listener.accept() => {
let (mut stream, addr) = match res {
Ok(stream) => stream, Ok(stream) => stream,
Err(e) => { Err(e) => {
warn!("Error accepting connection: {}", e); warn!("Error accepting connection: {}", e);
@ -136,6 +139,9 @@ async fn start_connection_listener(listener: TcpListener, cluster: Arc<RwLock<Cl
} }
}); });
} }
}
}
Ok(())
}) })
} }