rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-15 17:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

add timeout for read_version

Browse Source
This commit is contained in:
Conrad Ludgate
2024-03-10 09:32:26 +00:00
parent ec7c878364
commit 3c0eb1bf71
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
proxy/src/serverless.rs
View File

@@ -167,12 +167,20 @@ pub async fn task_main(
let (version, conn) = match conn.get_ref().1.alpn_protocol() {
Some(b"http/1.1") => (http_auto::Version::H1, Rewind::new(conn)),
Some(b"h2") => (http_auto::Version::H2, Rewind::new(conn)),
_ => match http_auto::read_version(conn).await {
Ok(v) => v,
Err(e) => {
tracing::warn!("HTTP connection error {e}");
return;
},
_ => {
tracing::debug!("HTTP: no ALPN negotiated");
let conn = timeout(Duration::from_secs(10), http_auto::read_version(conn)).await;
match conn {
Ok(Ok(v)) => v,
Ok(Err(e)) => {
tracing::warn!("HTTP connection error: {e}");
return;
},
Err(_) => {
tracing::warn!("HTTP connection error: timeout determining http version");
return;
}
}
}
};