twin/lazymc
1
0
Fork 0
mirror of https://github.com/timvisee/lazymc.git synced 2025-08-11 02:02:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Simplify waiting for server logic even further

Browse Source
This commit is contained in:
timvisee
2021-11-14 16:37:09 +01:00
parent 38d90681c7
commit 88fc5892a3
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/status.rs
View File

@@ -163,9 +163,7 @@ pub async fn hold<'a>(
let mut state = server.state_receiver(); let mut state = server.state_receiver();
loop { loop {
// Wait for state change // Wait for state change
if state.changed().await.is_err() { state.changed().await.unwrap();
break Err(());
}
match state.borrow().deref() { match state.borrow().deref() {
// Still waiting on server start // Still waiting on server start
@@ -176,19 +174,19 @@ pub async fn hold<'a>(
// Server started, start relaying and proxy // Server started, start relaying and proxy
State::Started => { State::Started => {
break Ok(()); break true;
} }
// Server stopping, this shouldn't happen, kick // Server stopping, this shouldn't happen, kick
State::Stopping => { State::Stopping => {
warn!(target: "lazymc", "Server stopping for held client, disconnecting"); warn!(target: "lazymc", "Server stopping for held client, disconnecting");
break Err(()); break false;
} }
// Server stopped, this shouldn't happen, disconnect // Server stopped, this shouldn't happen, disconnect
State::Stopped => { State::Stopped => {
error!(target: "lazymc", "Server stopped for held client, disconnecting"); error!(target: "lazymc", "Server stopped for held client, disconnecting");
break Err(()); break false;
} }
} }
} }
@@ -198,14 +196,14 @@ pub async fn hold<'a>(
let timeout = Duration::from_secs(config.time.hold_client_for as u64); let timeout = Duration::from_secs(config.time.hold_client_for as u64);
match time::timeout(timeout, task_wait).await { match time::timeout(timeout, task_wait).await {
// Relay client to proxy // Relay client to proxy
Ok(Ok(())) => { Ok(true) => {
info!(target: "lazymc", "Server ready for held client, relaying to server"); info!(target: "lazymc", "Server ready for held client, relaying to server");
service::server::route_proxy_queue(inbound, config, hold_queue); service::server::route_proxy_queue(inbound, config, hold_queue);
return Ok(()); return Ok(());
} }
// Server stopping/stopped, this shouldn't happen, kick // Server stopping/stopped, this shouldn't happen, kick
Ok(Err(())) => { Ok(false) => {
warn!(target: "lazymc", "Server stopping for held client, disconnecting"); warn!(target: "lazymc", "Server stopping for held client, disconnecting");
kick(&config.messages.login_stopping, &mut inbound.split().1).await?; kick(&config.messages.login_stopping, &mut inbound.split().1).await?;
} }