CyberCoveLLC/Triple-C
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 35 Wiki Activity

Give the exit-status poll room now that it fails closed

Browse Source 
`wait_for_exec_exit` returning `None` used to mean "call it 0"; it now
fails the call, so a busy daemon that has not settled within ~1s would
turn into a spurious "the rename failed". The loop exits on the first
poll that reports finished, so a wider window costs nothing when things
are normal.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GBq2rGum6GX7xXgsas1fDc
This commit is contained in:
shadow-test
2026-08-23 11:35:41 -07:00
co-authored by Claude Opus 5
parent 3329e07d3d
commit 2b6501d8e5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src-tauri/src/docker/exec.rs
+8 -2
View File
@@ -636,11 +636,17 @@ fn require_exit_code(code: Option<i64>) -> Result<i64, String> {
/// Poll `inspect_exec` until the exec reports finished and return its exit code. /// Poll `inspect_exec` until the exec reports finished and return its exit code.
/// Returns `None` if the code can't be determined (inspect error, or the exec /// Returns `None` if the code can't be determined (inspect error, or the exec
/// doesn't report finished within ~1s — which shouldn't happen once its output /// doesn't report finished within ~5s — which shouldn't happen once its output
/// stream has drained). /// stream has drained).
///
/// The window is generous because `None` is no longer a shrug: since
/// [`require_exit_code`], it fails the whole call. Waiting a few seconds longer
/// for a busy daemon to settle costs nothing in the normal case — the loop exits
/// on the first poll that reports finished — and it is the difference between a
/// spurious "the rename failed" and a real one.
pub async fn wait_for_exec_exit(exec_id: &str) -> Option<i64> { pub async fn wait_for_exec_exit(exec_id: &str) -> Option<i64> {
let docker = get_docker().ok()?; let docker = get_docker().ok()?;
for _ in 0..40 { for _ in 0..200 {
match docker.inspect_exec(exec_id).await { match docker.inspect_exec(exec_id).await {
Ok(info) => { Ok(info) => {
if info.running != Some(true) { if info.running != Some(true) {