tuxmain/rust-rpxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: connection handling timeout

Browse source
This commit is contained in:
Jun Kurihara 2024-02-15 21:50:22 +09:00
commit 8c0bbf17e2
No known key found for this signature in database
GPG key ID: D992B3E3DE1DED23
6 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpxy-lib/src/globals.rs
View file

@ -47,7 +47,7 @@ pub struct ProxyConfig {
pub sni_consistency: bool, // Handler
/// Connection handling timeout
/// timeout to handle a connection, total time of receive request, serve, and send response. this might limits the max length of response.
pub connection_handling_timeout: Duration,
pub connection_handling_timeout: Option<Duration>,
#[cfg(feature = "cache")]
pub cache_enabled: bool,
@ -94,7 +94,7 @@ impl Default for ProxyConfig {
keepalive: true,
sni_consistency: true,
connection_handling_timeout: Duration::from_secs(u64::MAX),
connection_handling_timeout: None,
#[cfg(feature = "cache")]
cache_enabled: false,

6
rpxy-lib/src/lib.rs
View file

@ -55,10 +55,10 @@ where
if proxy_config.https_port.is_some() {
info!("Listen port: {} (for TLS)", proxy_config.https_port.unwrap());
}
if proxy_config.connection_handling_timeout.as_secs() < u64::MAX {
if proxy_config.connection_handling_timeout.is_some() {
info!(
"Force connection handling timeout: {} sec",
proxy_config.connection_handling_timeout.as_secs()
"Force connection handling timeout: {:?} sec",
proxy_config.connection_handling_timeout.unwrap_or_default().as_secs()
);
}
#[cfg(any(feature = "http3-quinn", feature = "http3-s2n"))]

12
rpxy-lib/src/proxy/proxy_h3.rs
View file

@ -70,12 +70,12 @@ where
let self_inner = self.clone();
let tls_server_name_inner = tls_server_name.clone();
self.globals.runtime_handle.spawn(async move {
if let Err(e) = tokio::time::timeout(
self_inner.globals.proxy_config.connection_handling_timeout,
self_inner.h3_serve_stream(req, stream, client_addr, tls_server_name_inner),
)
.await
{
let fut = self_inner.h3_serve_stream(req, stream, client_addr, tls_server_name_inner);
if let Some(connection_handling_timeout) = self_inner.globals.proxy_config.connection_handling_timeout {
if let Err(e) = tokio::time::timeout(connection_handling_timeout, fut).await {
warn!("HTTP/3 error on serve stream: {}", e);
};
} else if let Err(e) = fut.await {
warn!("HTTP/3 error on serve stream: {}", e);
}
request_count.decrement();

37
rpxy-lib/src/proxy/proxy_main.rs
View file

@ -91,24 +91,25 @@ where
let handling_timeout = self.globals.proxy_config.connection_handling_timeout;
self.globals.runtime_handle.clone().spawn(async move {
timeout(
handling_timeout,
server_clone.serve_connection_with_upgrades(
stream,
service_fn(move |req: Request<Incoming>| {
serve_request(
req,
message_handler_clone.clone(),
peer_addr,
listening_on,
tls_enabled,
tls_server_name.clone(),
)
}),
),
)
.await
.ok();
let fut = server_clone.serve_connection_with_upgrades(
stream,
service_fn(move |req: Request<Incoming>| {
serve_request(
req,
message_handler_clone.clone(),
peer_addr,
listening_on,
tls_enabled,
tls_server_name.clone(),
)
}),
);
if let Some(handling_timeout) = handling_timeout {
timeout(handling_timeout, fut).await.ok();
} else {
fut.await.ok();
}
request_count.decrement();
debug!("Request processed: current # {}", request_count.current());