minke.yu/sglang
1
0
Fork 0
Code Issues Pull Requests Actions 12 Packages Projects Releases Wiki Activity

[model-gateway] refactor: extract common graceful shutdown code before TLS branch (#15494)

Browse Source
This commit is contained in:
Simo Lin
2025-12-19 12:56:33 -08:00
committed by GitHub
parent 50cad014dc
commit d72e908ba5
1 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sgl-model-gateway/src/server.rs
+13 -24
View File
@@ -988,6 +988,19 @@ pub async fn startup(config: ServerConfig) -> Result<(), Box<dyn std::error::Err
let bind_addr = format!("{}:{}", config.host, config.port); let bind_addr = format!("{}:{}", config.host, config.port);
info!("Starting server on {}", bind_addr); info!("Starting server on {}", bind_addr);
// Parse address and set up graceful shutdown (common to both TLS and non-TLS)
let addr: std::net::SocketAddr = bind_addr
.parse()
.map_err(|e| format!("Invalid address: {}", e))?;
let handle = axum_server::Handle::new();
let handle_clone = handle.clone();
let grace_period = Duration::from_secs(config.shutdown_grace_period_secs);
spawn(async move {
shutdown_signal().await;
handle_clone.graceful_shutdown(Some(grace_period));
});
if let (Some(cert), Some(key)) = ( if let (Some(cert), Some(key)) = (
&config.router_config.server_cert, &config.router_config.server_cert,
&config.router_config.server_key, &config.router_config.server_key,
@@ -1001,36 +1014,12 @@ pub async fn startup(config: ServerConfig) -> Result<(), Box<dyn std::error::Err
.await .await
.map_err(|e| format!("Failed to create TLS config: {}", e))?; .map_err(|e| format!("Failed to create TLS config: {}", e))?;
let addr: std::net::SocketAddr = bind_addr
.parse()
.map_err(|e| format!("Invalid address: {}", e))?;
let handle = axum_server::Handle::new();
let handle_clone = handle.clone();
let grace_period = Duration::from_secs(config.shutdown_grace_period_secs);
spawn(async move {
shutdown_signal().await;
handle_clone.graceful_shutdown(Some(grace_period));
});
axum_server::bind_rustls(addr, tls_config) axum_server::bind_rustls(addr, tls_config)
.handle(handle) .handle(handle)
.serve(app.into_make_service()) .serve(app.into_make_service())
.await .await
.map_err(|e| Box::new(e) as Box<dyn std::error::Error>)?; .map_err(|e| Box::new(e) as Box<dyn std::error::Error>)?;
} else { } else {
let addr: std::net::SocketAddr = bind_addr
.parse()
.map_err(|e| format!("Invalid address: {}", e))?;
let handle = axum_server::Handle::new();
let handle_clone = handle.clone();
let grace_period = Duration::from_secs(config.shutdown_grace_period_secs);
spawn(async move {
shutdown_signal().await;
handle_clone.graceful_shutdown(Some(grace_period));
});
axum_server::bind(addr) axum_server::bind(addr)
.handle(handle) .handle(handle)
.serve(app.into_make_service()) .serve(app.into_make_service())