jmug/stoatchat
1
0
Fork 1
mirror of https://github.com/stoatchat/stoatchat.git synced 2026-07-14 13:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(bonfire): drop connections if Redis disconnects

Browse Source
This commit is contained in:
Paul Makles
2024-06-20 21:40:44 +01:00
parent 8248a4a5b8
commit f16e72e329
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/bonfire/src/websocket.rs
View File

@@ -22,6 +22,7 @@ use revolt_presence::{create_session, delete_session};
use async_std::{
net::TcpStream,
sync::{Mutex, RwLock},
task::spawn,
};
use revolt_result::create_error;
use sentry::Level;
@@ -225,7 +226,16 @@ async fn listener(
return;
};
// TODO: subscriber.on_error(func)
// Handle Redis connection dropping
let (clean_up_s, clean_up_r) = async_channel::bounded(1);
let clean_up_s = Arc::new(Mutex::new(clean_up_s));
subscriber.on_error(move |_| {
let clean_up_s = clean_up_s.clone();
spawn(async move {
clean_up_s.lock().await.send(()).await.ok();
});
Ok(())
});
let mut message_rx = subscriber.message_rx();
'out: loop {
@@ -279,10 +289,14 @@ async fn listener(
let t1 = message_rx.recv().fuse();
let t2 = topic_signal_r.recv().fuse();
let t3 = kill_signal_r.recv().fuse();
let t4 = clean_up_r.recv().fuse();
pin_mut!(t1, t2, t3);
pin_mut!(t1, t2, t3, t4);
select! {
_ = t4 => {
break 'out;
},
_ = t3 => {
break 'out;
},