Skip to content

Added graceful_shutdown_v2 function. #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 44 additions & 1 deletion src/server/conn/auto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,36 @@ pub trait HttpServerConnExec<A, B: Body> {}
#[cfg(not(feature = "http2"))]
impl<A, B: Body, T> HttpServerConnExec<A, B> for T {}

/// Connection graceful shutdown flags.
pub struct GracefulShutdownFlags
{
/// Http2 connection graceful shutdown flags.
#[cfg(feature = "http2")]
http2: http2::GracefulShutdownFlags,
}

impl Default for GracefulShutdownFlags {
fn default() -> Self {
Self {
#[cfg(feature = "http2")]
http2: http2::GracefulShutdownFlags::None
}
}
}

impl GracefulShutdownFlags {
/// Create a new graceful shutdown flags structure.
pub fn new(
#[cfg(feature = "http2")]
http2_flags: http2::GracefulShutdownFlags
) -> Self {
Self{
#[cfg(feature = "http2")]
http2: http2_flags
}
}
}

/// Http1 or Http2 connection builder.
#[derive(Clone, Debug)]
pub struct Builder<E> {
Expand Down Expand Up @@ -361,12 +391,25 @@ where
/// This should only be called while the `Connection` future is still pending. If called after
/// `Connection::poll` has resolved, this does nothing.
pub fn graceful_shutdown(self: Pin<&mut Self>) {
self.graceful_shutdown_v2(GracefulShutdownFlags::default());
}

/// Start a graceful shutdown process for this connection.
///
/// Supports GracefulShutdownFlags as input parameters.
/// This `Connection` should continue to be polled until shutdown can finish.
///
/// # Note
///
/// This should only be called while the `Connection` future is still pending. If called after
/// `Connection::poll` has resolved, this does nothing.
pub fn graceful_shutdown_v2(self: Pin<&mut Self>, flags: GracefulShutdownFlags) {
match self.project().state.project() {
ConnStateProj::ReadVersion { read_version, .. } => read_version.cancel(),
#[cfg(feature = "http1")]
ConnStateProj::H1 { conn } => conn.graceful_shutdown(),
#[cfg(feature = "http2")]
ConnStateProj::H2 { conn } => conn.graceful_shutdown(),
ConnStateProj::H2 { conn } => conn.graceful_shutdown_v2(flags.http2),
#[cfg(any(not(feature = "http1"), not(feature = "http2")))]
_ => unreachable!(),
}
Expand Down