mirror of
https://github.com/chatmail/relay.git
synced 2026-09-20 06:10:08 +00:00
fix: do not crash if accepting new connection fails
If we run out of file descriptors, we cannot do anything to accept queued connections, so at least don't crash the process. Fixes <https://github.com/chatmail/filtermail/issues/139>.
This commit is contained in:
@@ -8,6 +8,7 @@ use hyper_util::rt::TokioIo;
|
|||||||
use std::convert::Infallible;
|
use std::convert::Infallible;
|
||||||
use std::pin::Pin;
|
use std::pin::Pin;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
use std::time::Duration;
|
||||||
use tokio::net::{TcpListener, TcpStream};
|
use tokio::net::{TcpListener, TcpStream};
|
||||||
|
|
||||||
/// Runs the HTTP server on the specified address with the given handler and maximum message size.
|
/// Runs the HTTP server on the specified address with the given handler and maximum message size.
|
||||||
@@ -21,8 +22,8 @@ where
|
|||||||
{
|
{
|
||||||
let listener = TcpListener::bind(addr).await?;
|
let listener = TcpListener::bind(addr).await?;
|
||||||
loop {
|
loop {
|
||||||
let (socket, _) = listener.accept().await?;
|
match listener.accept().await {
|
||||||
|
Ok((socket, _peer_addr)) => {
|
||||||
// Disable Nagle's algorithm.
|
// Disable Nagle's algorithm.
|
||||||
socket.set_nodelay(true)?;
|
socket.set_nodelay(true)?;
|
||||||
|
|
||||||
@@ -33,6 +34,14 @@ where
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Err(e) => {
|
||||||
|
log::error!("Error accepting connection: {e}");
|
||||||
|
|
||||||
|
// Sleep to avoid busy looping in case we ran into file descriptor limit.
|
||||||
|
tokio::time::sleep(Duration::from_secs(10)).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Handles a single HTTP connection.
|
/// Handles a single HTTP connection.
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ use crate::utils::{extract_address, log_eml};
|
|||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use memchr::{Memchr, memmem};
|
use memchr::{Memchr, memmem};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
use std::time::Duration;
|
||||||
use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader, BufWriter};
|
use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader, BufWriter};
|
||||||
use tokio::net::{TcpListener, TcpStream};
|
use tokio::net::{TcpListener, TcpStream};
|
||||||
|
|
||||||
@@ -110,8 +111,8 @@ where
|
|||||||
log::info!("entering serving loop");
|
log::info!("entering serving loop");
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let (socket, _) = listener.accept().await?;
|
match listener.accept().await {
|
||||||
|
Ok((socket, _peer_addr)) => {
|
||||||
// Disable Nagle's algorithm.
|
// Disable Nagle's algorithm.
|
||||||
socket.set_nodelay(true)?;
|
socket.set_nodelay(true)?;
|
||||||
|
|
||||||
@@ -122,6 +123,14 @@ where
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Err(e) => {
|
||||||
|
log::error!("Error accepting connection: {e}");
|
||||||
|
|
||||||
|
// Sleep to avoid busy looping in case we ran into file descriptor limit.
|
||||||
|
tokio::time::sleep(Duration::from_secs(10)).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Handles an individual SMTP connection.
|
/// Handles an individual SMTP connection.
|
||||||
|
|||||||
Reference in New Issue
Block a user