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 'imbris/char-load-log' into 'master'

Browse Source 
Logging to identify issue with character list not loading

See merge request veloren/veloren!4368
This commit is contained in:
Imbris
2024-03-06 02:50:59 +00:00
parent 4e4c35f936 301fc15b47
commit 61a374c23f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/persistence/character_loader.rs
View File

@ -10,7 +10,7 @@ use common::{
use crossbeam_channel::{self, TryIter}; use crossbeam_channel::{self, TryIter};
use rusqlite::Connection; use rusqlite::Connection;
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
use tracing::error; use tracing::{debug, error};
pub(crate) type CharacterListResult = Result<Vec<CharacterItem>, PersistenceError>; pub(crate) type CharacterListResult = Result<Vec<CharacterItem>, PersistenceError>;
pub(crate) type CharacterCreationResult = pub(crate) type CharacterCreationResult =
@ -101,9 +101,11 @@ impl CharacterLoader {
conn.update_log_mode(&settings); conn.update_log_mode(&settings);
let response = CharacterLoader::process_request(request, &conn); let response = CharacterLoader::process_request(request, &conn);
debug!("Processing complete");
if let Err(e) = internal_tx.send(response) { if let Err(e) = internal_tx.send(response) {
error!(?e, "Could not send character loader response"); error!(?e, "Could not send character loader response");
} }
debug!("Sent character loader response");
} }
}) })
.unwrap(); .unwrap();
@ -126,6 +128,7 @@ impl CharacterLoader {
target_entity: entity, target_entity: entity,
response_kind: match kind { response_kind: match kind {
CharacterLoaderRequestKind::LoadCharacterList { player_uuid } => { CharacterLoaderRequestKind::LoadCharacterList { player_uuid } => {
debug!(?player_uuid, "Loading character list");
CharacterScreenResponseKind::CharacterList(load_character_list( CharacterScreenResponseKind::CharacterList(load_character_list(
&player_uuid, &player_uuid,
connection, connection,
@ -135,6 +138,7 @@ impl CharacterLoader {
player_uuid, player_uuid,
character_id, character_id,
} => { } => {
debug!(?player_uuid, ?character_id, "Loading character data");
let result = load_character_data(player_uuid, character_id, connection); let result = load_character_data(player_uuid, character_id, connection);
if result.is_err() { if result.is_err() {
error!( error!(
@ -151,6 +155,7 @@ impl CharacterLoader {
/// Loads a list of characters belonging to the player identified by /// Loads a list of characters belonging to the player identified by
/// `player_uuid` /// `player_uuid`
pub fn load_character_list(&self, entity: specs::Entity, player_uuid: String) { pub fn load_character_list(&self, entity: specs::Entity, player_uuid: String) {
debug!(?player_uuid, "Requesting character list");
if let Err(e) = self if let Err(e) = self
.update_tx .update_tx
.send((entity, CharacterLoaderRequestKind::LoadCharacterList { .send((entity, CharacterLoaderRequestKind::LoadCharacterList {
@ -168,6 +173,7 @@ impl CharacterLoader {
player_uuid: String, player_uuid: String,
character_id: CharacterId, character_id: CharacterId,
) { ) {
debug!(?character_id, ?player_uuid, "Requesting character data");
if let Err(e) = if let Err(e) =
self.update_tx self.update_tx
.send((entity, CharacterLoaderRequestKind::LoadCharacterData { .send((entity, CharacterLoaderRequestKind::LoadCharacterData {