Merge branch 'ws-f/mcp-server' into integration/phase1
This commit is contained in:
commit
936efaf97e
1 file changed
+6
-1
+6
-1
@@ -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,
|
||||
|
||||
Reference in new issue
Block a user