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

Merge branch 'netfix5' into 'master'

Browse Source 
Netfix5

See merge request veloren/veloren!1305
This commit is contained in:
Marcel 2020-08-17 15:26:28 +00:00
commit 3be0cf913b
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ use common::{
}; };
use futures_executor::block_on; use futures_executor::block_on;
use specs::{saveload::MarkerAllocator, Builder, Entity as EcsEntity, WorldExt}; 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) { pub fn handle_exit_ingame(server: &mut Server, entity: EcsEntity) {
let state = server.state_mut(); let state = server.state_mut();
@ -80,13 +80,31 @@ pub fn handle_exit_ingame(server: &mut Server, entity: EcsEntity) {
pub fn handle_client_disconnect(server: &mut Server, entity: EcsEntity) -> Event { pub fn handle_client_disconnect(server: &mut Server, entity: EcsEntity) -> Event {
if let Some(client) = server.state().read_storage::<Client>().get(entity) { if let Some(client) = server.state().read_storage::<Client>().get(entity) {
trace!("Closing participant of client"); trace!("Closing participant of client");
let participant = client.participant.lock().unwrap().take().unwrap(); let participant = match client.participant.try_lock() {
if let Err(e) = block_on(participant.disconnect()) { Ok(mut p) => p.take().unwrap(),
debug!( Err(e) => {
?e, error!(?e, "coudln't lock participant for removal");
"Error when disconnecting client, maybe the pipe already broke" return Event::ClientDisconnected { entity };
); },
}; };
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(); let state = server.state_mut();