From e3fb186a44c16e56339fe2d2ba4843e80499789e4b49163c7e2ef30dfa50ce1d Mon Sep 17 00:00:00 2001 From: raven <7156279+RavenX8@users.noreply.github.com> Date: Fri, 20 Dec 2024 17:42:50 -0500 Subject: [PATCH] - fix: when shutting down a docker container, the services would not deregister from consul correctly --- api-service/src/main.rs | 8 +++++++- auth-service/src/main.rs | 10 ++++++++-- character-service/src/main.rs | 10 ++++++++-- database-service/src/main.rs | 8 +++++++- packet-service/src/main.rs | 10 ++++++++-- session-service/src/main.rs | 10 ++++++++-- world-service/src/main.rs | 10 ++++++++-- 7 files changed, 54 insertions(+), 12 deletions(-) diff --git a/api-service/src/main.rs b/api-service/src/main.rs index 4bebf1b..a11ad23 100644 --- a/api-service/src/main.rs +++ b/api-service/src/main.rs @@ -67,8 +67,14 @@ async fn main() -> Result<(), Box> { info!("Starting REST API on {}:{}", addr, port); tokio::spawn(axum_gateway::serve_rest_api(grpc_client)); + let mut sigterm_stream = signal::unix::signal(signal::unix::SignalKind::terminate())?; select! { - _ = signal::ctrl_c() => {}, + _ = signal::ctrl_c() => { + info!("Received SIGINT (Ctrl+C), shutting down..."); + }, + _ = sigterm_stream.recv() => { + info!("Received SIGTERM, shutting down..."); + }, } consul_registration::deregister_service(&consul_url, service_id.as_str()) diff --git a/auth-service/src/main.rs b/auth-service/src/main.rs index 85a3b10..cd9bba5 100644 --- a/auth-service/src/main.rs +++ b/auth-service/src/main.rs @@ -77,9 +77,15 @@ async fn main() -> Result<(), Box> { tokio::spawn(Server::builder() .add_service(AuthServiceServer::new(auth_service)) .serve(address)); - + + let mut sigterm_stream = signal::unix::signal(signal::unix::SignalKind::terminate())?; select! { - _ = signal::ctrl_c() => {}, + _ = signal::ctrl_c() => { + info!("Received SIGINT (Ctrl+C), shutting down..."); + }, + _ = sigterm_stream.recv() => { + info!("Received SIGTERM, shutting down..."); + }, } consul_registration::deregister_service(&consul_url, service_id.as_str()).await.expect(""); diff --git a/character-service/src/main.rs b/character-service/src/main.rs index d8aa656..c070283 100644 --- a/character-service/src/main.rs +++ b/character-service/src/main.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use std::env; use std::str::FromStr; use tokio::{select, signal}; -use tracing::Level; +use tracing::{info, Level}; use utils::consul_registration; use utils::service_discovery::get_service_address; @@ -50,8 +50,14 @@ async fn main() -> Result<(), Box> { let db_address = db_nodes.get(0).unwrap(); let db_url = format!("http://{}:{}", db_address.ServiceAddress, db_address.ServicePort); + let mut sigterm_stream = signal::unix::signal(signal::unix::SignalKind::terminate())?; select! { - _ = signal::ctrl_c() => {}, + _ = signal::ctrl_c() => { + info!("Received SIGINT (Ctrl+C), shutting down..."); + }, + _ = sigterm_stream.recv() => { + info!("Received SIGTERM, shutting down..."); + }, } consul_registration::deregister_service(&consul_url, service_id.as_str()).await.expect(""); diff --git a/database-service/src/main.rs b/database-service/src/main.rs index 56f8a4b..f9ff2b3 100644 --- a/database-service/src/main.rs +++ b/database-service/src/main.rs @@ -73,8 +73,14 @@ async fn main() -> Result<(), Box> { .add_service(CharacterServiceServer::new(my_service)) .serve(address)); + let mut sigterm_stream = signal::unix::signal(signal::unix::SignalKind::terminate())?; select! { - _ = signal::ctrl_c() => {}, + _ = signal::ctrl_c() => { + info!("Received SIGINT (Ctrl+C), shutting down..."); + }, + _ = sigterm_stream.recv() => { + info!("Received SIGTERM, shutting down..."); + }, } consul_registration::deregister_service(&consul_url, service_id.as_str()).await.expect(""); diff --git a/packet-service/src/main.rs b/packet-service/src/main.rs index 08a5392..14e2014 100644 --- a/packet-service/src/main.rs +++ b/packet-service/src/main.rs @@ -64,7 +64,7 @@ async fn handle_connection(stream: &mut TcpStream, pool: Arc, auth_c pool.release(buffer).await; } - + if let Some(state) = connection_service.get_connection(&connection_id) { let session_id = state.session_id.unwrap(); let mut auth_client = auth_client.lock().await; @@ -148,8 +148,14 @@ async fn main() -> Result<(), Box> { } }); + let mut sigterm_stream = signal::unix::signal(signal::unix::SignalKind::terminate())?; select! { - _ = signal::ctrl_c() => {}, + _ = signal::ctrl_c() => { + info!("Received SIGINT (Ctrl+C), shutting down..."); + }, + _ = sigterm_stream.recv() => { + info!("Received SIGTERM, shutting down..."); + }, } consul_registration::deregister_service(&consul_url, service_id.as_str()).await.expect(""); diff --git a/session-service/src/main.rs b/session-service/src/main.rs index f517d02..bab3ca2 100644 --- a/session-service/src/main.rs +++ b/session-service/src/main.rs @@ -8,7 +8,7 @@ use std::sync::Arc; use tokio::{select, signal}; use tokio::sync::Mutex; use tonic::transport::Server; -use tracing::Level; +use tracing::{info, Level}; use utils::consul_registration; use utils::redis_cache::RedisCache; use utils::service_discovery::get_service_address; @@ -68,8 +68,14 @@ async fn main() -> Result<(), Box> { .add_service(SessionServiceServer::new(session_service)) .serve(address)); + let mut sigterm_stream = signal::unix::signal(signal::unix::SignalKind::terminate())?; select! { - _ = signal::ctrl_c() => {}, + _ = signal::ctrl_c() => { + info!("Received SIGINT (Ctrl+C), shutting down..."); + }, + _ = sigterm_stream.recv() => { + info!("Received SIGTERM, shutting down..."); + }, } consul_registration::deregister_service(&consul_url, service_id.as_str()).await.expect(""); diff --git a/world-service/src/main.rs b/world-service/src/main.rs index 09a5d04..7e847e5 100644 --- a/world-service/src/main.rs +++ b/world-service/src/main.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use std::env; use std::str::FromStr; use tokio::{select, signal}; -use tracing::Level; +use tracing::{info, Level}; use utils::consul_registration; use utils::service_discovery::get_service_address; @@ -50,8 +50,14 @@ async fn main() -> Result<(), Box> { let db_address = db_nodes.get(0).unwrap(); let db_url = format!("http://{}:{}", db_address.ServiceAddress, db_address.ServicePort); + let mut sigterm_stream = signal::unix::signal(signal::unix::SignalKind::terminate())?; select! { - _ = signal::ctrl_c() => {}, + _ = signal::ctrl_c() => { + info!("Received SIGINT (Ctrl+C), shutting down..."); + }, + _ = sigterm_stream.recv() => { + info!("Received SIGTERM, shutting down..."); + }, } consul_registration::deregister_service(&consul_url, service_id.as_str()).await.expect("");