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

chore: update group active (#743) 

* chore: opti logs

* chore: update group active logic

* chore: fmt
This commit is contained in:
Nathan.fooo 2024-08-24 09:43:12 +08:00 committed by GitHub
parent 52f33e4d85
commit 1122031735
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/appflowy-collaborate/src/group/broadcast.rs
View File

@ -523,7 +523,9 @@ impl Subscription {
} }
if let Some(stream_stop_tx) = self.stream_stop_tx.take() { if let Some(stream_stop_tx) = self.stream_stop_tx.take() {
if let Err(err) = stream_stop_tx.send(()).await { if let Err(err) = stream_stop_tx.send(()).await {
warn!("the stream might be already stop, error: {}", err); if cfg!(debug_assertions) {
warn!("the stream might be already stop, error: {}", err);
}
} }
} }
} }

21
services/appflowy-collaborate/src/group/group_init.rs
View File

@ -11,7 +11,7 @@ use collab_entity::CollabType;
use dashmap::DashMap; use dashmap::DashMap;
use futures_util::{SinkExt, StreamExt}; use futures_util::{SinkExt, StreamExt};
use tokio::sync::{mpsc, RwLock}; use tokio::sync::{mpsc, RwLock};
use tracing::{error, event, info, trace}; use tracing::{error, event, trace};
use yrs::updates::decoder::Decode; use yrs::updates::decoder::Decode;
use yrs::updates::encoder::Encode; use yrs::updates::encoder::Encode;
use yrs::Update; use yrs::Update;
@ -200,24 +200,7 @@ impl CollabGroup {
modified_at.elapsed().as_secs() > 60 * 60 modified_at.elapsed().as_secs() > 60 * 60
} else { } else {
let elapsed_secs = modified_at.elapsed().as_secs(); let elapsed_secs = modified_at.elapsed().as_secs();
if elapsed_secs > self.timeout_secs() { elapsed_secs > self.timeout_secs() && self.subscribers.is_empty()
// Mark the group as inactive if it has been inactive for more than 3 hours, even if there are subscribers.
// Otherwise, return true only if there are no subscribers.
const MAXIMUM_SECS: u64 = 3 * 60 * 60;
if elapsed_secs > MAXIMUM_SECS {
info!(
"Group:{} is inactive for {} seconds, subscribers: {}",
self.object_id,
modified_at.elapsed().as_secs(),
self.subscribers.len()
);
true
} else {
self.subscribers.is_empty()
}
} else {
false
}
} }
} }