eliott/libsignal
1
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2026-04-25 17:25:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

net: Remove overzealous assert waiting for a websocket task to exit

Browse Source 
If a WS request fails because a channel has closed, the task should be
*in the process* of exiting, closing its channels along the way.
However, we can't assert that it's *done* exiting. We *do* still want
to log, however, because if this helper is ever called when the task
*isn't* exiting we'd like to know why it stalled out.
This commit is contained in:
Jordan Rose
2026-03-30 12:27:23 -07:00
parent 49d53a6506
commit 6f48650cea
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rust/net/src/chat/ws.rs
View File

@@ -853,8 +853,12 @@ async fn wait_for_task_to_finish(state: &mut TaskState) -> &Result<FinishReason,
response_tx: _,
} => {
// The send can only fail if the task has ended since it owns the
// other end of the channel.
assert!(task.is_finished());
// other end of the channel. However, the task might still be exiting.
if !task.is_finished() {
log::warn!(
"waiting on live websocket task to exit (it should be in the process of shutting down)"
);
}
task
}
TaskState::SignaledToEnd(task) => {
@@ -863,6 +867,7 @@ async fn wait_for_task_to_finish(state: &mut TaskState) -> &Result<FinishReason,
// That's not an error, but it means the task is exiting
// soon. We can wait for that and then use the error status
// if there is one.
log::info!("waiting on live websocket task to exit (it has been signalled to end)");
task
}
TaskState::Finished(finish_state) => return finish_state,