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

cleanup error codes

Browse Source
This commit is contained in:
Marcel Märtens 2021-05-07 14:37:08 +02:00
parent b443e4dd31
commit 2ea5fd876b
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/error.rs
View File

@ -9,7 +9,6 @@ pub enum Error {
NetworkErr(NetworkError), NetworkErr(NetworkError),
ParticipantErr(ParticipantError), ParticipantErr(ParticipantError),
StreamErr(StreamError), StreamErr(StreamError),
ServerWentMad,
ServerTimeout, ServerTimeout,
ServerShutdown, ServerShutdown,
TooManyPlayers, TooManyPlayers,

1
common/frontend/src/lib.rs
View File

@ -59,6 +59,7 @@ where
.add_directive("tokio_util=info".parse().unwrap()) .add_directive("tokio_util=info".parse().unwrap())
.add_directive("rustls=info".parse().unwrap()) .add_directive("rustls=info".parse().unwrap())
.add_directive("veloren_network_protocol=info".parse().unwrap()) .add_directive("veloren_network_protocol=info".parse().unwrap())
.add_directive("quinn_proto::connection=info".parse().unwrap())
.add_directive( .add_directive(
"veloren_server::persistence::character=info" "veloren_server::persistence::character=info"
.parse() .parse()

8
voxygen/src/menu/main/client_init.rs
View File

@ -17,7 +17,6 @@ use tracing::{trace, warn};
#[derive(Debug)] #[derive(Debug)]
pub enum Error { pub enum Error {
NoAddress,
ClientError { ClientError {
error: ClientError, error: ClientError,
mismatched_server_info: Option<ServerInfo>, mismatched_server_info: Option<ServerInfo>,
@ -128,8 +127,11 @@ impl ClientInit {
tokio::time::sleep(Duration::from_secs(5)).await; tokio::time::sleep(Duration::from_secs(5)).await;
} }
// Parsing/host name resolution successful but no connection succeeded. // Only possibility for no last_err is aborting
let _ = tx.send(Msg::Done(Err(last_err.unwrap_or(Error::NoAddress)))); let _ = tx.send(Msg::Done(Err(last_err.unwrap_or(Error::ClientError {
error: ClientError::Other("Connection attempt aborted by user".to_owned()),
mismatched_server_info: None,
}))));
// Safe drop runtime // Safe drop runtime
tokio::task::block_in_place(move || drop(runtime2)); tokio::task::block_in_place(move || drop(runtime2));

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

@ -279,7 +279,6 @@ fn get_client_msg_error(e: client_init::Error, localized_strings: &LocalizationH
use client::Error; use client::Error;
match e { match e {
InitError::NoAddress => localization.get("main.login.server_not_found").into(),
InitError::ClientError { InitError::ClientError {
error, error,
mismatched_server_info, mismatched_server_info,
@ -297,9 +296,6 @@ fn get_client_msg_error(e: client_init::Error, localized_strings: &LocalizationH
Error::AuthServerNotTrusted => { Error::AuthServerNotTrusted => {
localization.get("main.login.untrusted_auth_server").into() localization.get("main.login.untrusted_auth_server").into()
}, },
Error::ServerWentMad => localization
.get("main.login.outdated_client_or_server")
.into(),
Error::ServerTimeout => localization.get("main.login.timeout").into(), Error::ServerTimeout => localization.get("main.login.timeout").into(),
Error::ServerShutdown => localization.get("main.login.server_shut_down").into(), Error::ServerShutdown => localization.get("main.login.server_shut_down").into(),
Error::NotOnWhitelist => localization.get("main.login.not_on_whitelist").into(), Error::NotOnWhitelist => localization.get("main.login.not_on_whitelist").into(),