- add: signal handler to deregister from consul

database-service/src/main.rs

@@ -8,7 +8,9 @@ use sqlx::postgres::PgPoolOptions;
 use std::env;
 use std::net::ToSocketAddrs;
 use std::sync::Arc;
+ use tokio::{select, signal};
 use tonic::transport::Server;
+use tracing::info;
 use warp::Filter;
 
 mod consul_registration;
@@ -51,11 +53,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     tokio::spawn(warp::serve(health_route).run(health_check_endpoint_addr.to_socket_addrs()?.next().unwrap()));
 
-    tokio::spawn(async move {
-        tokio::signal::ctrl_c().await.unwrap();
-        consul_registration::deregister_service(&consul_url, service_name.as_str()).await.expect("");
-    });
-
     let full_addr = format!("{}:{}", &addr, port);
     let address = full_addr.parse().expect("Invalid address");
     let pool = PgPoolOptions::new()
@@ -73,10 +70,15 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Pass `shared_cache` into services as needed
     println!("Database Service running on {}", address);
-    Server::builder()
-        .add_service(DatabaseServiceServer::new(database_service))
-        .serve(address)
-        .await?;
+    tokio::spawn(Server::builder()
+            .add_service(DatabaseServiceServer::new(database_service))
+            .serve(address));
 
+    select! {
+        _ = signal::ctrl_c() => {},
+    }
+    
+    consul_registration::deregister_service(&consul_url, service_name.as_str()).await.expect("");
+    info!("service {} deregistered", service_name);
     Ok(())
 }