berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

add changelog entry

This commit is contained in:
Rob Ede 2022-03-02 03:48:20 +00:00
parent 7dd0ef88ee
commit a613342197
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actix-server/CHANGES.md
View File

@ -1,6 +1,9 @@
# Changes # Changes
## Unreleased - 2021-xx-xx ## Unreleased - 2021-xx-xx
- Wait for accept thread to stop before sending completion signal. [#443]
[#443]: https://github.com/actix/actix-net/pull/443
## 2.0.0 - 2022-01-19 ## 2.0.0 - 2022-01-19

5
actix-server/src/server.rs
View File

@ -246,7 +246,8 @@ impl ServerInner {
} => { } => {
self.stopping = true; self.stopping = true;
// signal accept thread to stop. This signal is non-blocking with no guarantee for immediate stop. // Signal accept thread to stop.
// Signal is non-blocking; we wait for thread to stop later.
self.waker_queue.wake(WakerInterest::Stop); self.waker_queue.wake(WakerInterest::Stop);
// send stop signal to workers // send stop signal to workers
@ -261,7 +262,7 @@ impl ServerInner {
let _ = join_all(workers_stop).await; let _ = join_all(workers_stop).await;
} }
// wait for accept thread stop. // wait for accept thread stop
self.accept_handle self.accept_handle
.take() .take()
.unwrap() .unwrap()