clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 14:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify storage URL timeout handling

Browse Source
This commit is contained in:
Charles Cunningham
2026-02-17 10:53:10 -08:00
parent 06862a36ea
commit 18a35e1d50
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
codex-rs/core/src/config/mod.rs
View File

@@ -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<String> {