refactor: moved signals mod to own file

mickvandijke · josecelano · commit 191fbac1353c · 2023-03-09T16:39:10.000Z
diff --git a/src/lib.rs b/src/lib.rs
@@ -5,6 +5,7 @@ pub mod jobs;
 pub mod logging;
 pub mod protocol;
 pub mod setup;
+pub mod signals;
 pub mod stats;
 pub mod tracker;
 pub mod udp;
@@ -30,47 +31,3 @@ pub mod ephemeral_instance_keys {
         pub static ref RANDOM_SEED: Seed = Rng::gen(&mut ThreadRng::default());
     }
 }
-
-pub mod signals {
-    use log::info;
-
-    /// Resolves on `ctrl_c` or the `terminate` signal.
-    pub async fn global_shutdown_signal() {
-        let ctrl_c = async {
-            tokio::signal::ctrl_c().await.expect("failed to install Ctrl+C handler");
-        };
-
-        #[cfg(unix)]
-        let terminate = async {
-            tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())
-                .expect("failed to install signal handler")
-                .recv()
-                .await;
-        };
-
-        #[cfg(not(unix))]
-        let terminate = std::future::pending::<()>();
-
-        tokio::select! {
-            _ = ctrl_c => {},
-            _ = terminate => {}
-        }
-    }
-
-    /// Resolves when the `stop_receiver` or the `global_shutdown_signal()` resolves.
-    pub async fn shutdown_signal(stop_receiver: tokio::sync::oneshot::Receiver<u8>) {
-        let stop = async { stop_receiver.await.expect("Failed to install stop signal.") };
-
-        tokio::select! {
-            _ = stop => {},
-            _ = global_shutdown_signal() => {}
-        }
-    }
-
-    /// Same as `shutdown_signal()`, but shows a message when it resolves.
-    pub async fn shutdown_signal_with_message(stop_receiver: tokio::sync::oneshot::Receiver<u8>, message: String) {
-        shutdown_signal(stop_receiver).await;
-
-        info!("{message}");
-    }
-}
diff --git a/src/signals.rs b/src/signals.rs
@@ -0,0 +1,41 @@
+use log::info;
+
+/// Resolves on `ctrl_c` or the `terminate` signal.
+pub async fn global_shutdown_signal() {
+    let ctrl_c = async {
+        tokio::signal::ctrl_c().await.expect("failed to install Ctrl+C handler");
+    };
+
+    #[cfg(unix)]
+    let terminate = async {
+        tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())
+            .expect("failed to install signal handler")
+            .recv()
+            .await;
+    };
+
+    #[cfg(not(unix))]
+    let terminate = std::future::pending::<()>();
+
+    tokio::select! {
+        _ = ctrl_c => {},
+        _ = terminate => {}
+    }
+}
+
+/// Resolves when the `stop_receiver` or the `global_shutdown_signal()` resolves.
+pub async fn shutdown_signal(stop_receiver: tokio::sync::oneshot::Receiver<u8>) {
+    let stop = async { stop_receiver.await.expect("Failed to install stop signal.") };
+
+    tokio::select! {
+        _ = stop => {},
+        _ = global_shutdown_signal() => {}
+    }
+}
+
+/// Same as `shutdown_signal()`, but shows a message when it resolves.
+pub async fn shutdown_signal_with_message(stop_receiver: tokio::sync::oneshot::Receiver<u8>, message: String) {
+    shutdown_signal(stop_receiver).await;
+
+    info!("{message}");
+}
