eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-17 11:10:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(gateway): use tokio channels as to not block gateway on exit

Browse source
This commit is contained in:
alyssa 2025-04-04 11:09:41 +00:00
parent 2578eb0e3c
commit cc7122e389
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/gateway/src/main.rs
View file

@ -10,12 +10,8 @@ use signal_hook::{
consts::{SIGINT, SIGTERM}, consts::{SIGINT, SIGTERM},
iterator::Signals, iterator::Signals,
}; };
use std::{ use std::{sync::Arc, time::Duration, vec::Vec};
sync::{mpsc::channel, Arc}, use tokio::{sync::mpsc::channel, task::JoinSet};
time::Duration,
vec::Vec,
};
use tokio::task::JoinSet;
use tracing::{error, info, warn}; use tracing::{error, info, warn};
use twilight_gateway::{MessageSender, ShardId}; use twilight_gateway::{MessageSender, ShardId};
use twilight_model::gateway::payload::outgoing::UpdatePresence; use twilight_model::gateway::payload::outgoing::UpdatePresence;
@ -28,7 +24,7 @@ const RUNTIME_CONFIG_KEY_EVENT_TARGET: &'static str = "event_target";
libpk::main!("gateway"); libpk::main!("gateway");
async fn real_main() -> anyhow::Result<()> { async fn real_main() -> anyhow::Result<()> {
let (shutdown_tx, shutdown_rx) = channel::<()>(); let (shutdown_tx, mut shutdown_rx) = channel::<()>(1);
let shutdown_tx = Arc::new(shutdown_tx); let shutdown_tx = Arc::new(shutdown_tx);
let redis = libpk::db::init_redis().await?; let redis = libpk::db::init_redis().await?;
@ -46,7 +42,8 @@ async fn real_main() -> anyhow::Result<()> {
let shards = discord::gateway::create_shards(redis.clone())?; let shards = discord::gateway::create_shards(redis.clone())?;
let (event_tx, _event_rx) = channel(); // arbitrary
let (event_tx, mut event_rx) = channel(1000);
let mut senders = Vec::new(); let mut senders = Vec::new();
let mut signal_senders = Vec::new(); let mut signal_senders = Vec::new();
@ -126,19 +123,19 @@ async fn real_main() -> anyhow::Result<()> {
let _ = sender.command(&presence); let _ = sender.command(&presence);
} }
let _ = shutdown_tx.send(()); let _ = shutdown_tx.send(()).await;
break; break;
} }
})); }));
let _ = shutdown_rx.recv(); let _ = shutdown_rx.recv().await;
// sleep 500ms to allow everything to clean up properly info!("gateway exiting, have a nice day!");
tokio::time::sleep(Duration::from_millis(500)).await;
set.abort_all(); set.abort_all();
info!("gateway exiting, have a nice day!"); // sleep 500ms to allow everything to clean up properly
tokio::time::sleep(Duration::from_millis(500)).await;
Ok(()) Ok(())
} }