zelo72
/
flodgatt
mirror of https://github.com/mastodon/flodgatt
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve disconnection error logging

This commit is contained in:
Daniel Sockwell 2020-04-24 17:55:37 -04:00
parent 314c8ca747
commit 58da8f92e5
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/response/stream/ws.rs
View File

@ -42,17 +42,17 @@ impl Ws {
.map_err(|_| -> warp::Error { unreachable!() }) .map_err(|_| -> warp::Error { unreachable!() })
.forward(transmit_to_ws) .forward(transmit_to_ws)
.map(|_r| ()) .map(|_r| ())
.map_err(|e| { // ignore errors that indicate normal disconnects. TODO - once we upgrade our
match e.to_string().as_ref() { // Warp version, we should stop matching on text, which is fragile.
"IO error: Broken pipe (os error 32)" => log::info!("transmit_to_ws error"), // just closed unix socket .map_err(|e| match e.to_string().as_ref() {
_ => log::warn!("WebSocket send error: {}", e), "IO error: Broken pipe (os error 32)"
} | "IO error: Connection reset by peer (os error 104)" => (),
e => log::warn!("WebSocket send error: {}", e),
}) })
} }
fn filtered(&mut self, update: &impl Payload) -> bool { fn filtered(&mut self, update: &impl Payload) -> bool {
let (blocks, allowed_langs) = (&self.0.blocks, &self.0.allowed_langs); let (blocks, allowed_langs) = (&self.0.blocks, &self.0.allowed_langs);
let skip = |msg| Some(log::info!("{:?} msg skipped - {}", self.0.timeline, msg)).is_some();
let skip = |reason, tl| Some(log::info!("{:?} msg skipped - {}", tl, reason)).is_some();
match self.0.timeline { match self.0.timeline {
tl if tl.is_public() tl if tl.is_public()
@ -60,16 +60,13 @@ impl Ws {
&& !allowed_langs.is_empty() && !allowed_langs.is_empty()
&& !allowed_langs.contains(&update.language()) => && !allowed_langs.contains(&update.language()) =>
{ {
skip("disallowed language", tl) skip("disallowed language")
} }
_ if !blocks.blocked_users.is_disjoint(&update.involved_users()) => {
tl if !blocks.blocked_users.is_disjoint(&update.involved_users()) => { skip("involves blocked user")
skip("involves blocked user", tl)
}
tl if blocks.blocking_users.contains(update.author()) => skip("from blocking user", tl),
tl if blocks.blocked_domains.contains(update.sent_from()) => {
skip("from blocked domain", tl)
} }
_ if blocks.blocking_users.contains(update.author()) => skip("from blocking user"),
_ if blocks.blocked_domains.contains(update.sent_from()) => skip("from blocked domain"),
_ => false, _ => false,
} }
} }