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

no longer block when disconnecting a player

Browse Source
This commit is contained in:
Marcel Märtens 2020-08-17 16:34:02 +02:00
parent 1beea5967f
commit 08e7063a36
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ use common::{
};
use futures_executor::block_on;
use specs::{saveload::MarkerAllocator, Builder, Entity as EcsEntity, WorldExt};
use tracing::{debug, error, trace};
use tracing::{debug, error, trace, warn};
pub fn handle_exit_ingame(server: &mut Server, entity: EcsEntity) {
let state = server.state_mut();
@ -84,15 +84,27 @@ pub fn handle_client_disconnect(server: &mut Server, entity: EcsEntity) -> Event
Ok(mut p) => p.take().unwrap(),
Err(e) => {
error!(?e, "coudln't lock participant for removal");
panic!("coudlnt lock participant, not good!");
return Event::ClientDisconnected { entity };
},
};
if let Err(e) = block_on(participant.disconnect()) {
debug!(
?e,
"Error when disconnecting client, maybe the pipe already broke"
);
};
std::thread::spawn(|| {
let pid = participant.remote_pid();
let now = std::time::Instant::now();
trace!(?pid, "start disconnect");
if let Err(e) = block_on(participant.disconnect()) {
debug!(
?e,
"Error when disconnecting client, maybe the pipe already broke"
);
};
trace!(?pid, "finished disconnect");
let elapsed = now.elapsed();
if elapsed.as_millis() > 100 {
warn!(?elapsed, "disconecting took quite long");
} else {
debug!(?elapsed, "disconecting took");
}
});
}
let state = server.state_mut();