From dfacc0574914f796bfa5de896e785cf69c44e56b Mon Sep 17 00:00:00 2001 From: Joscha Date: Tue, 24 Jan 2023 17:43:03 +0100 Subject: [PATCH] Log full packets under different target --- src/conn.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/conn.rs b/src/conn.rs index 71791af..b15c6b2 100644 --- a/src/conn.rs +++ b/src/conn.rs @@ -408,7 +408,7 @@ impl Conn { match msg { tungstenite::Message::Text(text) => { let packet = serde_json::from_str(&text)?; - debug!("Received {packet:?}"); + debug!(target: "euphoxide::conn::full", "Received {packet:?}"); let packet = ParsedPacket::from_packet(packet)?; self.on_packet(&packet).await?; return Ok(Some(packet)); @@ -547,7 +547,7 @@ impl Conn { throttled: None, } .into_packet()?; - debug!("Sending {packet:?}"); + debug!(target: "euphoxide::conn::full", "Sending {packet:?}"); let msg = tungstenite::Message::Text(serde_json::to_string(&packet)?); self.ws.send(msg).await?; @@ -565,7 +565,7 @@ impl Conn { throttled: None, } .into_packet()?; - debug!("Sending {packet:?}"); + debug!(target: "euphoxide::conn::full", "Sending {packet:?}"); let msg = tungstenite::Message::Text(serde_json::to_string(&packet)?); self.ws.send(msg).await?; @@ -574,9 +574,8 @@ impl Conn { } async fn disconnect(&mut self) -> Result { - // TODO Maybe timeout this - let _ = self.ws.close(None).await; - debug!("Closed connection gracefully"); + let _ = tokio::time::timeout(self.replies.timeout(), self.ws.close(None)).await; + debug!("Closed connection"); Err(Error::ConnectionClosed) }