From debe03fb39749fda7e28299d82355c7dca7594ae Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 15 Oct 2026 18:48:29 -0400 Subject: [PATCH] WS-F: report shutdown, not reader death, when journal channel closes on shutdown Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_01YShymaPrXmc3KYRUg2HMSs --- src/mcp/mod.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mcp/mod.rs b/src/mcp/mod.rs index 4c3fe49..ebb389e 100644 --- a/src/mcp/mod.rs +++ b/src/mcp/mod.rs @@ -269,6 +269,7 @@ impl TrackerService { let deadline = tokio::time::Instant::now() + Duration::from_secs(secs); while out.len() < entry_cap { tokio::select! { + biased; () = self.state.shutdown.cancelled() => { note = Some("server is shutting down; stopped early".to_owned()); break; @@ -276,7 +277,11 @@ impl TrackerService { r = tokio::time::timeout_at(deadline, rx.recv()) => match r { Ok(Some(e)) => out.push(e), Ok(None) => { - note = Some("journal reader closed before the time cap; this is not a quiet period, the reader stopped".to_owned()); + note = Some(if self.state.shutdown.is_cancelled() { + "server is shutting down; stopped early".to_owned() + } else { + "journal reader closed before the time cap; this is not a quiet period, the reader stopped".to_owned() + }); break; } Err(_) => break,