From 18a35e1d505314fdf81c9efec172973ffacb654d Mon Sep 17 00:00:00 2001 From: Charles Cunningham Date: Tue, 17 Feb 2026 10:53:10 -0800 Subject: [PATCH] Simplify storage URL timeout handling --- codex-rs/core/src/config/mod.rs | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/codex-rs/core/src/config/mod.rs b/codex-rs/core/src/config/mod.rs index aeeeb589e2..d67c24d642 100644 --- a/codex-rs/core/src/config/mod.rs +++ b/codex-rs/core/src/config/mod.rs @@ -1918,23 +1918,21 @@ impl Config { let mut handle = tokio::task::spawn_blocking(move || { Self::try_run_command_for_value(Some(&command), "session_object_storage_url_cmd") }); - let resolved = - match tokio::time::timeout(SESSION_OBJECT_STORAGE_URL_CMD_TIMEOUT, &mut handle).await { - Ok(result) => result.map_err(|err| { - std::io::Error::other(format!("session_object_storage_url_cmd panicked: {err}")) - })?, - Err(_) => { - handle.abort(); - return Err(std::io::Error::new( - ErrorKind::TimedOut, - format!( - "session_object_storage_url_cmd timed out after {}s", - SESSION_OBJECT_STORAGE_URL_CMD_TIMEOUT.as_secs() - ), - )); - } - }; - resolved + match tokio::time::timeout(SESSION_OBJECT_STORAGE_URL_CMD_TIMEOUT, &mut handle).await { + Ok(result) => result.map_err(|err| { + std::io::Error::other(format!("session_object_storage_url_cmd panicked: {err}")) + })?, + Err(_) => { + handle.abort(); + Err(std::io::Error::new( + ErrorKind::TimedOut, + format!( + "session_object_storage_url_cmd timed out after {}s", + SESSION_OBJECT_STORAGE_URL_CMD_TIMEOUT.as_secs() + ), + )) + } + } } fn load_instructions(codex_dir: Option<&Path>) -> Option {