From 5560d316387b039e13aaef58e692d1f2eb40c5f5 Mon Sep 17 00:00:00 2001
From: Johannes Heuel <johannes.heuel@rwth-aachen.de>
Date: Fri, 16 Feb 2024 14:47:32 +0100
Subject: [PATCH] capture signal handling in a function

---
 src/main.rs   | 25 ++++---------------------
 src/signal.rs | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 src/signal.rs

diff --git a/src/main.rs b/src/main.rs
index 4ff881c..b4749ca 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,17 +2,15 @@ mod handler;
 use handler::Handler;
 mod commands;
 mod metadata;
+mod signal;
 mod state;
 use dotenv::dotenv;
 use futures::StreamExt;
+use signal::signal_handler;
 use songbird::{shards::TwilightMap, Songbird};
 use state::StateRef;
 use std::{env, error::Error, sync::Arc};
-use tokio::{
-    select,
-    signal::unix::{signal, SignalKind},
-    sync::watch,
-};
+use tokio::select;
 use tracing::{debug, info};
 use twilight_cache_inmemory::InMemoryCache;
 use twilight_gateway::{
@@ -32,20 +30,6 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
     // Initialize the tracing subscriber.
     tracing_subscriber::fmt::init();
 
-    let (stop_tx, mut stop_rx) = watch::channel(());
-
-    tokio::spawn(async move {
-        let mut sigterm = signal(SignalKind::terminate()).unwrap();
-        let mut sigint = signal(SignalKind::interrupt()).unwrap();
-        loop {
-            select! {
-                _ = sigterm.recv() => println!("Receive SIGTERM"),
-                _ = sigint.recv() => println!("Receive SIGTERM"),
-            };
-            stop_tx.send(()).unwrap();
-        }
-    });
-
     let (mut shards, state) = {
         let token = env::var("DISCORD_TOKEN")?;
         let app_id = env::var("DISCORD_APP_ID")?.parse()?;
@@ -91,6 +75,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
     };
 
     let mut handler = Handler::new(Arc::clone(&state));
+    let mut stop_rx = signal_handler();
     let mut stream = ShardEventStream::new(shards.iter_mut());
     loop {
         select! {
@@ -109,11 +94,9 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
                     Some((_, Ok(event))) => event,
                     Some((_, Err(source))) => {
                         tracing::warn!(?source, "error receiving event");
-
                         if source.is_fatal() {
                             break;
                         }
-
                         continue;
                     }
                     None => break,
diff --git a/src/signal.rs b/src/signal.rs
new file mode 100644
index 0000000..35eb57d
--- /dev/null
+++ b/src/signal.rs
@@ -0,0 +1,21 @@
+use tokio::{
+    select,
+    signal::unix::{signal, SignalKind},
+    sync::watch,
+};
+
+pub(crate) fn signal_handler() -> watch::Receiver<()> {
+    let (stop_tx, stop_rx) = watch::channel(());
+    tokio::spawn(async move {
+        let mut sigterm = signal(SignalKind::terminate()).unwrap();
+        let mut sigint = signal(SignalKind::interrupt()).unwrap();
+        loop {
+            select! {
+                _ = sigterm.recv() => println!("Receive SIGTERM"),
+                _ = sigint.recv() => println!("Receive SIGTERM"),
+            };
+            stop_tx.send(()).unwrap();
+        }
+    });
+    stop_rx
+}