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

Don't return an error when failing to send AddProjectCollaborator

Browse source 
This can happen when a peer has disconnected but we haven't yet been
able to acquire a lock to the store to clean up the state associated
with it.
This commit is contained in:
Antonio Scandurra 2022-11-01 11:21:40 +01:00
parent ef72c75fab
commit f54f653d42
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/collab/src/rpc.rs
View file

@ -1041,17 +1041,19 @@ impl Server {
for conn_id in project.connection_ids() { for conn_id in project.connection_ids() {
if conn_id != request.sender_id { if conn_id != request.sender_id {
self.peer.send( self.peer
conn_id, .send(
proto::AddProjectCollaborator { conn_id,
project_id: project_id.to_proto(), proto::AddProjectCollaborator {
collaborator: Some(proto::Collaborator { project_id: project_id.to_proto(),
peer_id: request.sender_id.0, collaborator: Some(proto::Collaborator {
replica_id: replica_id as u32, peer_id: request.sender_id.0,
user_id: guest_user_id.to_proto(), replica_id: replica_id as u32,
}), user_id: guest_user_id.to_proto(),
}, }),
)?; },
)
.trace_err();
} }
} }