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/init-error' into 'master'

Browse Source 
Log the raw client error at the ERROR level and include the dates in the...

See merge request veloren/veloren!2464
This commit is contained in:
Imbris
2021-06-19 07:53:16 +00:00
parent 2abd23ec64 247606f8d5
commit 380c58b6fc
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
voxygen/src/menu/main/mod.rs
View File

@ -135,7 +135,7 @@ impl PlayState for MainMenuState {
}, },
Some(InitMsg::Done(Err(e))) => { Some(InitMsg::Done(Err(e))) => {
self.init = InitState::None; self.init = InitState::None;
tracing::trace!(?e, "raw Client Init error"); error!(?e, "Client Init failed raw error");
let e = get_client_msg_error(e, &global_state.i18n); let e = get_client_msg_error(e, &global_state.i18n);
// Log error for possible additional use later or incase that the error // Log error for possible additional use later or incase that the error
// displayed is cut of. // displayed is cut of.
@ -336,21 +336,26 @@ impl PlayState for MainMenuState {
} }
} }
fn get_client_msg_error(e: client_init::Error, localized_strings: &LocalizationHandle) -> String { fn get_client_msg_error(
error: client_init::Error,
localized_strings: &LocalizationHandle,
) -> String {
let localization = localized_strings.read(); let localization = localized_strings.read();
// When a network error is received and there is a mismatch between the client // When a network error is received and there is a mismatch between the client
// and server version it is almost definitely due to this mismatch rather than // and server version it is almost definitely due to this mismatch rather than
// a true networking error. // a true networking error.
let net_e = |error: String, mismatched_server_info: Option<ServerInfo>| -> String { let net_error = |error: String, mismatched_server_info: Option<ServerInfo>| -> String {
if let Some(server_info) = mismatched_server_info { if let Some(server_info) = mismatched_server_info {
format!( format!(
"{} {}: {} {}: {}", "{} {}: {} ({}) {}: {} ({})",
localization.get("main.login.network_wrong_version"), localization.get("main.login.network_wrong_version"),
localization.get("main.login.client_version"), localization.get("main.login.client_version"),
common::util::GIT_HASH.to_string(), &*common::util::GIT_HASH,
&*common::util::GIT_DATE,
localization.get("main.login.server_version"), localization.get("main.login.server_version"),
server_info.git_hash server_info.git_hash,
server_info.git_date,
) )
} else { } else {
format!( format!(
@ -362,7 +367,7 @@ fn get_client_msg_error(e: client_init::Error, localized_strings: &LocalizationH
}; };
use client::Error; use client::Error;
match e { match error {
InitError::ClientError { InitError::ClientError {
error, error,
mismatched_server_info, mismatched_server_info,
@ -389,15 +394,15 @@ fn get_client_msg_error(e: client_init::Error, localized_strings: &LocalizationH
Error::InvalidCharacter => localization.get("main.login.invalid_character").into(), Error::InvalidCharacter => localization.get("main.login.invalid_character").into(),
Error::NetworkErr(NetworkError::ConnectFailed(NetworkConnectError::Handshake( Error::NetworkErr(NetworkError::ConnectFailed(NetworkConnectError::Handshake(
InitProtocolError::WrongVersion(_), InitProtocolError::WrongVersion(_),
))) => net_e( ))) => net_error(
localization localization
.get("main.login.network_wrong_version") .get("main.login.network_wrong_version")
.to_owned(), .to_owned(),
mismatched_server_info, mismatched_server_info,
), ),
Error::NetworkErr(e) => net_e(e.to_string(), mismatched_server_info), Error::NetworkErr(e) => net_error(e.to_string(), mismatched_server_info),
Error::ParticipantErr(e) => net_e(e.to_string(), mismatched_server_info), Error::ParticipantErr(e) => net_error(e.to_string(), mismatched_server_info),
Error::StreamErr(e) => net_e(e.to_string(), mismatched_server_info), Error::StreamErr(e) => net_error(e.to_string(), mismatched_server_info),
Error::HostnameLookupFailed(e) => { Error::HostnameLookupFailed(e) => {
format!("{}: {}", localization.get("main.login.server_not_found"), e) format!("{}: {}", localization.get("main.login.server_not_found"), e)
}, },
@ -419,9 +424,7 @@ fn get_client_msg_error(e: client_init::Error, localized_strings: &LocalizationH
client::AuthClientError::InsecureSchema => { client::AuthClientError::InsecureSchema => {
localization.get("main.login.insecure_auth_scheme").into() localization.get("main.login.insecure_auth_scheme").into()
}, },
client::AuthClientError::ServerError(_, e) => { client::AuthClientError::ServerError(_, e) => String::from_utf8_lossy(&e).into(),
String::from_utf8_lossy(&e).to_string()
},
}, },
Error::AuthServerUrlInvalid(e) => { Error::AuthServerUrlInvalid(e) => {
format!( format!(