Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add more logging to Room

Browse source
This commit is contained in:
Antonio Scandurra 2022-12-14 11:43:12 +01:00
parent 674fddac87
commit 553585b9a1
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -823,6 +823,7 @@ dependencies = [
"futures 0.3.25", "futures 0.3.25",
"gpui", "gpui",
"live_kit_client", "live_kit_client",
"log",
"media", "media",
"postage", "postage",
"project", "project",

1
crates/call/Cargo.toml
View file

@ -21,6 +21,7 @@ test-support = [
client = { path = "../client" } client = { path = "../client" }
collections = { path = "../collections" } collections = { path = "../collections" }
gpui = { path = "../gpui" } gpui = { path = "../gpui" }
log = "0.4"
live_kit_client = { path = "../live_kit_client" } live_kit_client = { path = "../live_kit_client" }
media = { path = "../media" } media = { path = "../media" }
project = { path = "../project" } project = { path = "../project" }

23
crates/call/src/room.rs
View file

@ -13,7 +13,7 @@ use live_kit_client::{LocalTrackPublication, LocalVideoTrack, RemoteVideoTrackUp
use postage::stream::Stream; use postage::stream::Stream;
use project::Project; use project::Project;
use std::{mem, sync::Arc, time::Duration}; use std::{mem, sync::Arc, time::Duration};
use util::{post_inc, ResultExt}; use util::{post_inc, ResultExt, TryFutureExt};
pub const RECONNECT_TIMEOUT: Duration = client::RECEIVE_TIMEOUT; pub const RECONNECT_TIMEOUT: Duration = client::RECEIVE_TIMEOUT;
@ -50,7 +50,7 @@ pub struct Room {
user_store: ModelHandle<UserStore>, user_store: ModelHandle<UserStore>,
subscriptions: Vec<client::Subscription>, subscriptions: Vec<client::Subscription>,
pending_room_update: Option<Task<()>>, pending_room_update: Option<Task<()>>,
maintain_connection: Option<Task<Result<()>>>, maintain_connection: Option<Task<Option<()>>>,
} }
impl Entity for Room { impl Entity for Room {
@ -58,6 +58,7 @@ impl Entity for Room {
fn release(&mut self, _: &mut MutableAppContext) { fn release(&mut self, _: &mut MutableAppContext) {
if self.status.is_online() { if self.status.is_online() {
log::info!("room was released, sending leave message");
self.client.send(proto::LeaveRoom {}).log_err(); self.client.send(proto::LeaveRoom {}).log_err();
} }
} }
@ -122,7 +123,7 @@ impl Room {
}; };
let maintain_connection = let maintain_connection =
cx.spawn_weak(|this, cx| Self::maintain_connection(this, client.clone(), cx)); cx.spawn_weak(|this, cx| Self::maintain_connection(this, client.clone(), cx).log_err());
Self { Self {
id, id,
@ -229,6 +230,7 @@ impl Room {
cx.notify(); cx.notify();
cx.emit(Event::Left); cx.emit(Event::Left);
log::info!("leaving room");
self.status = RoomStatus::Offline; self.status = RoomStatus::Offline;
self.remote_participants.clear(); self.remote_participants.clear();
self.pending_participants.clear(); self.pending_participants.clear();
@ -254,6 +256,7 @@ impl Room {
.map_or(false, |s| s.is_connected()); .map_or(false, |s| s.is_connected());
// Even if we're initially connected, any future change of the status means we momentarily disconnected. // Even if we're initially connected, any future change of the status means we momentarily disconnected.
if !is_connected || client_status.next().await.is_some() { if !is_connected || client_status.next().await.is_some() {
log::info!("detected client disconnection");
let room_id = this let room_id = this
.upgrade(&cx) .upgrade(&cx)
.ok_or_else(|| anyhow!("room was dropped"))? .ok_or_else(|| anyhow!("room was dropped"))?
@ -269,8 +272,13 @@ impl Room {
let client_reconnection = async { let client_reconnection = async {
let mut remaining_attempts = 3; let mut remaining_attempts = 3;
while remaining_attempts > 0 { while remaining_attempts > 0 {
log::info!(
"waiting for client status change, remaining attempts {}",
remaining_attempts
);
if let Some(status) = client_status.next().await { if let Some(status) = client_status.next().await {
if status.is_connected() { if status.is_connected() {
log::info!("client reconnected, attempting to rejoin room");
let rejoin_room = async { let rejoin_room = async {
let response = let response =
client.request(proto::JoinRoom { id: room_id }).await?; client.request(proto::JoinRoom { id: room_id }).await?;
@ -285,7 +293,7 @@ impl Room {
anyhow::Ok(()) anyhow::Ok(())
}; };
if rejoin_room.await.is_ok() { if rejoin_room.await.log_err().is_some() {
return true; return true;
} else { } else {
remaining_attempts -= 1; remaining_attempts -= 1;
@ -303,12 +311,15 @@ impl Room {
futures::select_biased! { futures::select_biased! {
reconnected = client_reconnection => { reconnected = client_reconnection => {
if reconnected { if reconnected {
log::info!("successfully reconnected to room");
// If we successfully joined the room, go back around the loop // If we successfully joined the room, go back around the loop
// waiting for future connection status changes. // waiting for future connection status changes.
continue; continue;
} }
} }
_ = reconnection_timeout => {} _ = reconnection_timeout => {
log::info!("room reconnection timeout expired");
}
} }
} }
@ -316,6 +327,7 @@ impl Room {
// or an error occurred while trying to re-join the room. Either way // or an error occurred while trying to re-join the room. Either way
// we leave the room and return an error. // we leave the room and return an error.
if let Some(this) = this.upgrade(&cx) { if let Some(this) = this.upgrade(&cx) {
log::info!("reconnection failed, leaving room");
let _ = this.update(&mut cx, |this, cx| this.leave(cx)); let _ = this.update(&mut cx, |this, cx| this.leave(cx));
} }
return Err(anyhow!( return Err(anyhow!(
@ -499,6 +511,7 @@ impl Room {
this.pending_room_update.take(); this.pending_room_update.take();
if this.should_leave() { if this.should_leave() {
log::info!("room is empty, leaving");
let _ = this.leave(cx); let _ = this.leave(cx);
} }