chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: update logs

This commit is contained in:
nathan 2024-03-05 16:11:42 +08:00
parent 90b1633df1
commit ba1fa8f307
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/realtime/src/server/rt_server.rs
View File

@ -20,6 +20,7 @@ use crate::server::collaborate::all_group::AllGroup;
use crate::server::collaborate::group_cmd::{GroupCommand, GroupCommandRunner, GroupCommandSender}; use crate::server::collaborate::group_cmd::{GroupCommand, GroupCommandRunner, GroupCommandSender};
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
use tokio::time::interval; use tokio::time::interval;
use tokio_stream::wrappers::{BroadcastStream, ReceiverStream}; use tokio_stream::wrappers::{BroadcastStream, ReceiverStream};
use tokio_stream::StreamExt; use tokio_stream::StreamExt;
@ -296,7 +297,7 @@ where
remove_user(&groups, &editing_collab_by_user, &msg.user).await; remove_user(&groups, &editing_collab_by_user, &msg.user).await;
if client_stream_by_user.remove(&msg.user).is_some() { if client_stream_by_user.remove(&msg.user).is_some() {
trace!("remove client stream: {}", &msg.user); info!("remove client stream: {}", &msg.user);
} }
Ok(()) Ok(())
}) })
@ -423,11 +424,17 @@ pub async fn broadcast_client_collab_message<U>(
{ {
if let Some(client_stream) = client_streams.get(user) { if let Some(client_stream) = client_streams.get(user) {
trace!("[realtime]: receive:{}", collab_message); trace!("[realtime]: receive:{}", collab_message);
let object_id = collab_message.object_id().to_string();
let err = client_stream let err = client_stream
.stream_tx .stream_tx
.send(Ok(RealtimeMessage::ClientCollabV1(vec![collab_message]))); .send(Ok(RealtimeMessage::ClientCollabV1(vec![collab_message])));
if let Err(err) = err { if let Err(err) = err {
warn!("Send message to client error: {}", err); warn!(
"Send user:{} message to group:{} error: {}",
user.uid(),
err,
object_id,
);
} }
} }
} }
@ -473,7 +480,7 @@ pub struct CollabClientStream {
/// ///
/// The message flow: /// The message flow:
/// ClientSession(websocket) -> [RealtimeServer] -> [CollabClientStream] -> [CollabBroadcast] 1->* websocket(client) /// ClientSession(websocket) -> [RealtimeServer] -> [CollabClientStream] -> [CollabBroadcast] 1->* websocket(client)
pub(crate) stream_tx: tokio::sync::broadcast::Sender<Result<RealtimeMessage, StreamError>>, stream_tx: tokio::sync::broadcast::Sender<Result<RealtimeMessage, StreamError>>,
} }
impl CollabClientStream { impl CollabClientStream {
@ -527,8 +534,7 @@ impl CollabClientStream {
}); });
let client_sink = UnboundedSenderSink::<T>::new(client_sink_tx); let client_sink = UnboundedSenderSink::<T>::new(client_sink_tx);
// forward the message to the stream that was subscribed by the broadcast group, which will // forward the message to the stream that was subscribed by the broadcast group
// send the messages to all connected clients using the client_forward_sink
let cloned_object_id = object_id.to_string(); let cloned_object_id = object_id.to_string();
let (tx, rx) = tokio::sync::mpsc::channel(100); let (tx, rx) = tokio::sync::mpsc::channel(100);
tokio::spawn(async move { tokio::spawn(async move {