fix: effective ctrl+c shutdown

subgraph-radio/src/metrics/mod.rs

@@ -5,6 +5,8 @@ use axum::Router;
 use once_cell::sync::Lazy;
 use prometheus::{core::Collector, Registry};
 use prometheus::{IntCounterVec, IntGauge, IntGaugeVec, Opts};
+use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
 use std::{net::SocketAddr, str::FromStr};
 use tracing::{debug, info};
 
@@ -124,7 +126,7 @@ pub async fn get_metrics() -> (StatusCode, String) {
 
 /// Run the API server as well as Prometheus and a traffic generator
 #[allow(dead_code)]
-pub async fn handle_serve_metrics(host: String, port: u16) {
+pub async fn handle_serve_metrics(host: String, port: u16, _running_program: Arc<AtomicBool>) {
     // Set up the exporter to collect metrics
     let _exporter = global_metrics_exporter();
 
@@ -139,6 +141,7 @@ pub async fn handle_serve_metrics(host: String, port: u16) {
 
     server
         .serve(app.into_make_service())
+        // .with_graceful_shutdown(shutdown_signal(running_program))
         .await
-        .expect("Error starting example API server");
+        .expect("Error starting Prometheus metrics service");
 }

subgraph-radio/src/operator/mod.rs

@@ -214,7 +214,11 @@ impl RadioOperator {
         // Set up Prometheus metrics url if configured
         if let Some(port) = self.config.metrics_port {
             debug!("Initializing metrics port");
-            tokio::spawn(handle_serve_metrics(self.config.metrics_host.clone(), port));
+            tokio::spawn(handle_serve_metrics(
+                self.config.metrics_host.clone(),
+                port,
+                self.control_flow.running.clone(),
+            ));
         }
 
         // Provide generated topics to Graphcast agent

subgraph-radio/src/server/mod.rs

@@ -11,7 +11,6 @@ use crate::{
         model::{build_schema, SubgraphRadioContext},
         routes::{graphql_handler, graphql_playground, health},
     },
-    shutdown_signal,
     state::PersistedState,
 };
 
@@ -25,7 +24,7 @@ pub mod routes;
 pub async fn run_server(
     config: Config,
     persisted_state: &'static PersistedState,
-    running_program: Arc<AtomicBool>,
+    _running_program: Arc<AtomicBool>,
 ) {
     if config.server_port().is_none() {
         return;
@@ -50,11 +49,11 @@ pub async fn run_server(
 
     info!(
         host = tracing::field::debug(config.server_host()),
-        port, "Bind and serve"
+        port, "Bind port to service"
     );
     Server::bind(&addr)
         .serve(app.into_make_service())
-        .with_graceful_shutdown(shutdown_signal(running_program))
+        // .with_graceful_shutdown(shutdown_signal(running_program))
         .await
-        .unwrap();
+        .expect("Error starting API service");
 }