me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bind beacon server only once

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-05-12 13:43:39 +02:00
parent b7c65c877d
commit e770804435
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
3 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
beacon/src/client.rs
View file

@ -110,9 +110,11 @@ async fn run(
match send(&mut stream, output).await {
Ok(()) => {}
Err(error) => {
log::warn!(
"Error sending message to server: {error}"
);
if error.kind() != io::ErrorKind::BrokenPipe {
log::warn!(
"Error sending message to server: {error}"
);
}
break;
}
}

29
beacon/src/lib.rs
View file

@ -64,9 +64,9 @@ pub fn run() -> impl Stream<Item = Event> {
stream::channel(|mut output| async move {
let mut buffer = Vec::new();
loop {
let mut stream = match connect().await {
Ok(stream) => stream,
let server = loop {
match net::TcpListener::bind(client::SERVER_ADDRESS).await {
Ok(server) => break server,
Err(error) => {
if error.kind() == io::ErrorKind::AddrInUse {
let _ = output
@ -75,11 +75,17 @@ pub fn run() -> impl Stream<Item = Event> {
})
.await;
}
delay().await;
continue;
}
};
};
loop {
let Ok((mut stream, _)) = server.accept().await else {
continue;
};
let _ = stream.set_nodelay(true);
loop {
match receive(&mut stream, &mut buffer).await {
@ -160,8 +166,6 @@ pub fn run() -> impl Stream<Item = Event> {
at: SystemTime::now(),
})
.await;
delay().await;
break;
}
Err(Error::DecodingFailed(error)) => {
@ -173,17 +177,6 @@ pub fn run() -> impl Stream<Item = Event> {
})
}
async fn connect() -> Result<net::TcpStream, io::Error> {
let listener = net::TcpListener::bind(client::SERVER_ADDRESS).await?;
let (stream, _) = listener.accept().await?;
stream.set_nodelay(true)?;
stream.readable().await?;
Ok(stream)
}
async fn receive(
stream: &mut net::TcpStream,
buffer: &mut Vec<u8>,