Merge pull request #93 from cspr-rad/feature/clean-shutdown

clean shutdown + default log level INFO

kairos-server/src/lib.rs

@@ -29,10 +29,33 @@ pub fn app_router(state: Arc<state::BatchStateManager>) -> Router {
 pub async fn run(config: ServerConfig) {
     let app = app_router(BatchStateManager::new_empty());
 
-    tracing::info!("starting http server on `{}`", config.socket_addr);
     let listener = tokio::net::TcpListener::bind(config.socket_addr)
         .await
         .unwrap();
     tracing::info!("listening on `{}`", listener.local_addr().unwrap());
-    axum::serve(listener, app).await.unwrap();
+
+    axum::serve(listener, app)
+        .with_graceful_shutdown(shutdown_signal())
+        .await
+        .unwrap();
+}
+
+async fn shutdown_signal() {
+    let ctrl_c = async {
+        tokio::signal::ctrl_c()
+            .await
+            .expect("Failed to install Ctrl+C handler");
+    };
+
+    let terminate = async {
+        tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())
+            .expect("Failed to install signal handler")
+            .recv()
+            .await;
+    };
+
+    tokio::select! {
+        _ = ctrl_c => {tracing::info!("Received CTRL+C signal, shutting down...")},
+        _ = terminate => {tracing::info!("Received shutdown signal, shutting down...")},
+    }
 }

kairos-server/src/main.rs

@@ -3,7 +3,12 @@ use kairos_server::config::ServerConfig;
 
 #[tokio::main]
 async fn main() {
-    tracing_subscriber::fmt::init();
+    let subscriber = tracing_subscriber::fmt()
+        .with_max_level(tracing::Level::INFO)
+        .finish();
+
+    tracing::subscriber::set_global_default(subscriber).expect("Failed to set subscriber");
+
     // loads the environment from the current directories .env file
     // if the .env does not exist in the current directory,
     // we still go ahead and try to obtain a server config from the environment