Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

investigate if participant mutex causes server hang

Browse Source
This commit is contained in:
Marcel Märtens 2020-08-17 14:21:36 +02:00
parent 6d2c4b9c1a
commit 1beea5967f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/events/player.rs
View File

@ -80,7 +80,13 @@ pub fn handle_exit_ingame(server: &mut Server, entity: EcsEntity) {
pub fn handle_client_disconnect(server: &mut Server, entity: EcsEntity) -> Event {
if let Some(client) = server.state().read_storage::<Client>().get(entity) {
trace!("Closing participant of client");
let participant = client.participant.lock().unwrap().take().unwrap();
let participant = match client.participant.try_lock() {
Ok(mut p) => p.take().unwrap(),
Err(e) => {
error!(?e, "coudln't lock participant for removal");
panic!("coudlnt lock participant, not good!");
},
};
if let Err(e) = block_on(participant.disconnect()) {
debug!(
?e,