diff --git a/deny.toml b/deny.toml index 0d4461fb2..0d4981760 100644 --- a/deny.toml +++ b/deny.toml @@ -23,7 +23,7 @@ targets = [ all-features = true [advisories] -ignore = ["RUSTSEC-2024-0384"] +ignore = ["RUSTSEC-2024-0384", { id = "RUSTSEC-2024-0421", reason = "transitive dependency, updated but not released https://github.com/hickory-dns/hickory-dns/pull/2564" }] [bans] deny = [ diff --git a/src/components/proxy/io_uring_shared.rs b/src/components/proxy/io_uring_shared.rs index 7593db7fd..d0871bfca 100644 --- a/src/components/proxy/io_uring_shared.rs +++ b/src/components/proxy/io_uring_shared.rs @@ -539,7 +539,13 @@ impl IoUringLoop { loop_ctx.enqueue_send(pending); } } else { - tracing::info!("io-uring loop shutdown requested"); + if matches!(ctx, PacketProcessorCtx::Router { .. }) { + tracing::info!( + "downstream io-uring loop shutdown requested" + ); + } else { + tracing::info!("session io-uring loop shutdown requested"); + } break 'io; } } diff --git a/src/components/proxy/sessions.rs b/src/components/proxy/sessions.rs index 0ee3a57dd..5a6f523f6 100644 --- a/src/components/proxy/sessions.rs +++ b/src/components/proxy/sessions.rs @@ -524,7 +524,6 @@ impl Session { self.active_session_metric().dec(); inner_metrics::duration_secs().observe(self.created_at.elapsed().as_secs() as f64); tracing::debug!(source = %self.key.source, dest_address = %self.key.dest, "Session closed"); - self.pending_sends.shutdown_receiver(); SessionPool::release_socket(self.pool.clone(), self.key, self.socket_port); } }