Skip to content

fix: eliminate tls acceptor unwrap in server accept loops #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kacy merged 1 commit into from
Feb 8, 2026
Merged

fix: eliminate tls acceptor unwrap in server accept loops #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions crates/ember-server/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,10 @@ pub async fn run(
// helper to accept from TLS listener or pend forever if disabled
let tls_accept = || async {
match &tls_listener {
Some((listener, _)) => listener.accept().await,
Some((listener, acceptor)) => {
let (stream, addr) = listener.accept().await?;
Ok::<_, std::io::Error>((stream, addr, acceptor.clone()))
}
None => std::future::pending().await,
}
};
Expand Down Expand Up @@ -202,7 +205,7 @@ pub async fn run(

// TLS accept (pends forever if TLS not configured)
result = tls_accept() => {
let (stream, peer) = result?;
let (stream, peer, acceptor) = result?;

if let Err(e) = stream.set_nodelay(true) {
warn!("failed to set TCP_NODELAY: {e}");
Expand Down Expand Up @@ -236,7 +239,6 @@ pub async fn run(
let ctx = Arc::clone(&ctx);
let slow_log = Arc::clone(&slow_log);
let pubsub = Arc::clone(&pubsub);
let acceptor = tls_listener.as_ref().map(|(_, a)| a.clone()).unwrap();

tokio::spawn(async move {
// perform TLS handshake
Expand Down Expand Up @@ -356,7 +358,10 @@ pub async fn run_concurrent(
// helper to accept from TLS listener or pend forever if disabled
let tls_accept = || async {
match &tls_listener {
Some((listener, _)) => listener.accept().await,
Some((listener, acceptor)) => {
let (stream, addr) = listener.accept().await?;
Ok::<_, std::io::Error>((stream, addr, acceptor.clone()))
}
None => std::future::pending().await,
}
};
Expand Down Expand Up @@ -423,7 +428,7 @@ pub async fn run_concurrent(

// TLS accept (pends forever if TLS not configured)
result = tls_accept() => {
let (stream, peer) = result?;
let (stream, peer, acceptor) = result?;

if let Err(e) = stream.set_nodelay(true) {
warn!("failed to set TCP_NODELAY: {e}");
Expand Down Expand Up @@ -457,7 +462,6 @@ pub async fn run_concurrent(
let ctx = Arc::clone(&ctx);
let slow_log = Arc::clone(&slow_log);
let pubsub = Arc::clone(&pubsub);
let acceptor = tls_listener.as_ref().map(|(_, a)| a.clone()).unwrap();

tokio::spawn(async move {
match acceptor.accept(stream).await {
Expand Down