mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 19:02:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Listen to SIGTERM in addition to ctrl-c for graceful shutdown

Browse source
This commit is contained in:
Antonio Scandurra 2022-12-13 23:03:04 +01:00
parent 7824ace58b
commit 34b69896e4
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/collab/k8s/environments/preview.sh
View file

@ -1,3 +1,3 @@
ZED_ENVIRONMENT=preview ZED_ENVIRONMENT=preview
RUST_LOG=debug RUST_LOG=info
INVITE_LINK_PREFIX=https://zed.dev/invites/ INVITE_LINK_PREFIX=https://zed.dev/invites/

11
crates/collab/src/main.rs
View file

@ -7,6 +7,7 @@ use std::{
net::{SocketAddr, TcpListener}, net::{SocketAddr, TcpListener},
path::Path, path::Path,
}; };
use tokio::signal::unix::SignalKind;
use tracing_log::LogTracer; use tracing_log::LogTracer;
use tracing_subscriber::{filter::EnvFilter, fmt::format::JsonFields, Layer}; use tracing_subscriber::{filter::EnvFilter, fmt::format::JsonFields, Layer};
use util::ResultExt; use util::ResultExt;
@ -66,9 +67,15 @@ async fn main() -> Result<()> {
axum::Server::from_tcp(listener)? axum::Server::from_tcp(listener)?
.serve(app.into_make_service_with_connect_info::<SocketAddr>()) .serve(app.into_make_service_with_connect_info::<SocketAddr>())
.with_graceful_shutdown(async move { .with_graceful_shutdown(async move {
tokio::signal::ctrl_c() let mut sigterm = tokio::signal::unix::signal(SignalKind::terminate())
.await
.expect("failed to listen for interrupt signal"); .expect("failed to listen for interrupt signal");
let mut sigint = tokio::signal::unix::signal(SignalKind::interrupt())
.expect("failed to listen for interrupt signal");
let sigterm = sigterm.recv();
let sigint = sigint.recv();
futures::pin_mut!(sigterm);
futures::pin_mut!(sigint);
futures::future::select(sigterm, sigint).await;
tracing::info!("Received interrupt signal"); tracing::info!("Received interrupt signal");
rpc_server.teardown(); rpc_server.teardown();
}) })