修复在docker中无法正常关闭的问题

Chikage0o0 · Oct 16, 2023 · 5c548da · 5c548da
1 parent b913130
commit 5c548da
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/matrix_bot/src/main.rs b/matrix_bot/src/main.rs
@@ -61,6 +61,7 @@ async fn main() {
     let _ = load_plugins(&matrix_client, args.data.join("plugins"), &args.plugins);
 
     let ctrlc = tokio::signal::ctrl_c();
+    let mut term= tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate()).unwrap();
 
     let client = matrix_client.clone();
 
@@ -70,6 +71,21 @@ async fn main() {
             .await
     });
 
+    #[cfg(unix)]
+    tokio::select! {
+        _=ctrlc => {
+            log::info!("Ctrl-c received, stopping");
+        }
+        _=handle => {
+            log::error!("Syncing stopped");
+        }
+
+        _=term.recv() => {
+            log::info!("SIGTERM received, stopping");
+        }
+    }
+
+    #[cfg(not(unix))]
     tokio::select! {
         _=ctrlc => {
             log::info!("Ctrl-c received, stopping");