fedserv/echoIRCd
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resilience: isolate per-connection panics in the plaintext reactor (catch_unwind read/write -> drop just that conn) and log worker-thread panics instead of vanishing silently

Browse source
This commit is contained in:
Jean Chevronnet 2026-08-12 13:19:25 +00:00
parent 145a01b2c2
commit e91b64a4db
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/socketengine.rs
View file

@ -351,11 +351,25 @@ pub fn run_reactor(
}
}
Token(t) => {
// isolate per-connection I/O: a panic framing one client's bytes
// drops that client, never the reactor that serves all the others.
if event.is_readable() {
read_conn(&mut poll, &mut conns, t, &core);
let r = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
read_conn(&mut poll, &mut conns, t, &core)
}));
if r.is_err() {
eprintln!("[reactor] recovered from a panic reading a socket; dropping that connection");
close_conn(&mut poll, &mut conns, t, &core);
}
}
if event.is_writable() && conns.contains_key(&t) {
flush_conn(&mut poll, &mut conns, t, &core);
let r = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
flush_conn(&mut poll, &mut conns, t, &core)
}));
if r.is_err() {
eprintln!("[reactor] recovered from a panic writing a socket; dropping that connection");
close_conn(&mut poll, &mut conns, t, &core);
}
}
}
}