From b4b8303bae1810e3c3b32bb879c00027e62518e8 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 8 Nov 2023 17:33:47 +0800 Subject: [PATCH] chore: remove log --- libs/client-api/src/ws/client.rs | 6 +++--- libs/realtime-entity/src/collab_msg.rs | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/client-api/src/ws/client.rs b/libs/client-api/src/ws/client.rs index 86f8fe7c..b0045287 100644 --- a/libs/client-api/src/ws/client.rs +++ b/libs/client-api/src/ws/client.rs @@ -137,7 +137,6 @@ impl WSClient { match msg { RealtimeMessage::Collab(collab_msg) => { if let Some(channels) = weak_channels.upgrade() { - info!("subscribe get: {}", collab_msg.object_id()); if let Some(channel) = channels.read().get(collab_msg.object_id()) { match channel.upgrade() { None => { @@ -198,13 +197,14 @@ impl WSClient { tokio::select! { _ = &mut stop_rx => break, Ok(msg) = rx.recv() => { - trace!("[websocket]: send message with size:{}", msg.len()); // The maximum size allowed for a WebSocket message is 65,536 bytes. If the message exceeds // 40,960 bytes (to avoid occupying the entire space), it should be sent over HTTP instead. if msg.is_binary() && msg.len() > 40960 { + let len = msg.len(); + trace!("[websocket]: send message with size:{}", len); if let Some(http_sender) = weak_http_sender.upgrade() { match http_sender.send_ws_msg(&device_id, msg).await { - Ok(_) => debug!("WebSocket message sent via HTTP."), + Ok(_) => debug!("WebSocket message sent via HTTP. len: {}", len), Err(err) => error!("Failed to send WebSocket message over HTTP: {}", err), } } else { diff --git a/libs/realtime-entity/src/collab_msg.rs b/libs/realtime-entity/src/collab_msg.rs index 2d262d29..0f49bad9 100644 --- a/libs/realtime-entity/src/collab_msg.rs +++ b/libs/realtime-entity/src/collab_msg.rs @@ -163,38 +163,38 @@ impl Display for CollabMessage { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { match self { CollabMessage::ClientInit(value) => f.write_fmt(format_args!( - "client init: [{}|oid:{}|msg_id:{}|payload_len:{}]", + "client init: [{}|oid:{}|msg_id:{}|len:{}]", value.origin, value.object_id, value.msg_id, value.payload.len(), )), CollabMessage::ClientUpdateSync(value) => f.write_fmt(format_args!( - "client update: [oid:{}|msg_id:{:?}|payload_len:{}]", + "client update: [oid:{}|msg_id:{:?}|len:{}]", value.object_id, value.msg_id, value.payload.len(), )), CollabMessage::ClientUpdateAck(value) => f.write_fmt(format_args!( - "ack: [oid:{}|msg_id:{:?}|payload_len:{}]", + "ack: [oid:{}|msg_id:{:?}|len:{}]", value.object_id, value.msg_id, value.payload.len(), )), CollabMessage::ServerInit(value) => f.write_fmt(format_args!( - "server init: [oid:{}|msg_id:{:?}|payload_len:{}]", + "server init: [oid:{}|msg_id:{:?}|len:{}]", value.object_id, value.msg_id, value.payload.len(), )), CollabMessage::ServerBroadcast(value) => f.write_fmt(format_args!( - "server broadcast: [{}|oid:{}|payload_len:{}]", + "server broadcast: [{}|oid:{}|len:{}]", value.origin, value.object_id, value.payload.len(), )), CollabMessage::ServerAwareness(value) => f.write_fmt(format_args!( - "awareness: [oid:{}|payload_len:{}]", + "awareness: [oid:{}|len:{}]", value.object_id, value.payload.len(), )), @@ -324,7 +324,7 @@ impl From for CollabMessage { impl Display for ServerCollabInit { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { f.write_fmt(format_args!( - "server init: [uid:{:?}|oid:{}|msg_id:{:?}|payload_len:{}]", + "server init: [uid:{:?}|oid:{}|msg_id:{:?}|len:{}]", self.origin.client_user_id(), self.object_id, self.msg_id, @@ -387,7 +387,7 @@ impl From for CollabMessage { impl Display for UpdateSync { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { f.write_fmt(format_args!( - "client update sync: [uid:{:?}|oid:{}|msg_id:{:?}|payload_len:{}]", + "client update sync: [uid:{:?}|oid:{}|msg_id:{:?}|len:{}]", self.origin.client_user_id(), self.object_id, self.msg_id, @@ -424,7 +424,7 @@ impl From for CollabMessage { impl Display for UpdateAck { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { f.write_fmt(format_args!( - "client update ack: [uid:{:?}|oid:{}|msg_id:{:?}|payload_len:{}]", + "client update ack: [uid:{:?}|oid:{}|msg_id:{:?}|len:{}]", self.origin.client_user_id(), self.object_id, self.msg_id,