mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
instead of trying to connect for 80 minutes, just try 4 mins, added Changelog
This commit is contained in:
parent
e7195b57ad
commit
fe47b11345
@ -49,6 +49,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
- Fixed unable to use ability; Secondary and ability3 (fire rod) will now automatically wield
|
||||
- Gliding is now a toggle that can be triggered from the ground
|
||||
- Replaced `log` with `tracing` in all crates
|
||||
- Switch to a new network backend that will allow several improvements in the future
|
||||
- Connection screen fails after 4 minutes if it can't connect to the server instead of 80 minutes
|
||||
|
||||
### Removed
|
||||
|
||||
|
@ -12,6 +12,7 @@ use std::{
|
||||
thread,
|
||||
time::Duration,
|
||||
};
|
||||
use tracing::debug;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum Error {
|
||||
@ -70,8 +71,8 @@ impl ClientInit {
|
||||
|
||||
let mut last_err = None;
|
||||
|
||||
'tries: for _ in 0..960 + 1 {
|
||||
// 300 Seconds
|
||||
const FOUR_MINUTES_RETRIES: u64 = 48;
|
||||
'tries: for _ in 0..FOUR_MINUTES_RETRIES {
|
||||
if cancel2.load(Ordering::Relaxed) {
|
||||
break;
|
||||
}
|
||||
@ -102,7 +103,12 @@ impl ClientInit {
|
||||
match err {
|
||||
ClientError::NetworkErr(NetworkError::ConnectFailed(
|
||||
..,
|
||||
)) => {},
|
||||
)) => {
|
||||
debug!(
|
||||
"can't reach the server, going to retry in a few \
|
||||
seconds"
|
||||
);
|
||||
},
|
||||
// Non-connection error, stop attempts
|
||||
err => {
|
||||
last_err = Some(Error::ClientError(err));
|
||||
|
Loading…
Reference in New Issue
Block a user