fix: graceful shutdown after switch to hyper 1.x
#779
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For some reason it was removed after switch to `hyper 1.x` ([commit](poem-web@0b6ca89)) <details> <summary> Patch affected the behavior </summary> ```patch - let mut conn = Http::new() - .serve_connection(socket, service) - .with_upgrades(); + let builder = auto::Builder::new(hyper_util::rt::TokioExecutor::new()); + let conn = + builder.serve_connection_with_upgrades(hyper_util::rt::TokioIo::new(socket), service); + futures_util::pin_mut!(conn); tokio::select! { - _ = &mut conn => { + _ = conn => { // Connection completed successfully. return; }, @@ -366,10 +368,4 @@ } _ = server_graceful_shutdown_token.cancelled() => {} } - - // Init graceful shutdown for connection (`GOAWAY` for `HTTP/2` or disabling `keep-alive` for `HTTP/1`) - Pin::new(&mut conn).graceful_shutdown(); - - // Continue awaiting after graceful-shutdown is initiated to handle existed requests. - let _ = conn.await; ``` </details>
DDtKey
changed the title
1.xhyper 1.x
|
Thanks! |
DDtKey
added a commit
to DDtKey/poem
that referenced
this pull request
Mar 27, 2024
For some reason it was removed after switch to `hyper 1.x` ([commit](poem-web@0b6ca89)) <details> <summary> Patch affected the behavior </summary> ```patch - let mut conn = Http::new() - .serve_connection(socket, service) - .with_upgrades(); + let builder = auto::Builder::new(hyper_util::rt::TokioExecutor::new()); + let conn = + builder.serve_connection_with_upgrades(hyper_util::rt::TokioIo::new(socket), service); + futures_util::pin_mut!(conn); tokio::select! { - _ = &mut conn => { + _ = conn => { // Connection completed successfully. return; }, @@ -366,10 +368,4 @@ } _ = server_graceful_shutdown_token.cancelled() => {} } - - // Init graceful shutdown for connection (`GOAWAY` for `HTTP/2` or disabling `keep-alive` for `HTTP/1`) - Pin::new(&mut conn).graceful_shutdown(); - - // Continue awaiting after graceful-shutdown is initiated to handle existed requests. - let _ = conn.await; ``` </details> (cherry picked from commit 6484545)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It was removed after switch to
hyper 1.x(commit) for some reasonIs there any reason? Because it seems to broke the logic (encountered issues after upgrade)
The changes affected the behavior