tamipes/mc-ingress
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: docker-image would not build due to syntax mistake
All checks were successful
/ build (push) Successful in 5m25s
Details

Browse source
This commit is contained in:
Tamipes 2026-06-08 01:00:37 +02:00
parent fb52167fc2
commit 3f8fb4a01f
3 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/main.rs
View file

@ -101,10 +101,10 @@ async fn main() {
tokio::select! {
result = api_task => {
tracing::error!("The api tokio:spawn'ed task run to completion, which should not happen!");
tracing::error!("The api tokio:spawn'ed task ran to completion, which should not happen!");
}
result = conn_task => {
tracing::error!("The connection handling tokio:spawn'ed task run to completion, which should not happen!");
tracing::error!("The connection handling tokio:spawn'ed task ran to completion, which should not happen!");
}
}
}
@ -171,8 +171,8 @@ where
let span = tracing::span!(
tracing::Level::INFO,
"login_username_extract",
server_addr = handshake.get_server_address(),
server_port = handshake.server_port.get_value()
join_addr = handshake.get_server_address(),
join_port = handshake.server_port.get_value()
);
let packet = Packet::parse(&mut client_stream)
@ -195,7 +195,7 @@ where
Ok(())
}
#[tracing::instrument(level = "info", fields(server_addr = handshake.get_server_address(),server_port = handshake.server_port.get_value()),skip(client_stream, handshake, api))]
#[tracing::instrument(level = "info", fields(join_addr = handshake.get_server_address(),join_port = handshake.server_port.get_value()),skip(client_stream, handshake, api))]
async fn handle_status<T: MinecraftServerHandle>(
client_stream: &mut TcpStream,
handshake: &Handshake,
@ -212,7 +212,7 @@ where
)));
};
let server_addr = handshake.get_server_address();
let join_addr = handshake.get_server_address();
let mut status_struct = StatusStructNew::create();
status_struct.version.protocol = handshake.protocol_version.get_int();
@ -229,7 +229,7 @@ where
status_struct.players.max = 0;
status_struct.players.online = 0;
status_struct.description.text = format!(
"Could not find §kserver§r: §f§o{server_addr}§r\nMinecraft Ingress - {BYE_MESSAGE}"
"Could not find §kserver§r: §f§o{join_addr}§r\nMinecraft Ingress - {BYE_MESSAGE}"
);
mc_server::complete_status_request(client_stream, status_struct)
@ -289,7 +289,7 @@ where
return mc_server::handle_ping(client_stream).await;
}
#[tracing::instrument(level = "info", fields(server_addr = handshake.get_server_address(),server_port = handshake.server_port.get_value(),username = login_start.name.get_value()),skip(client_stream, handshake, api, login_start))]
#[tracing::instrument(level = "info", fields(join_addr = handshake.get_server_address(),join_port = handshake.server_port.get_value(),username = login_start.name.get_value()),skip(client_stream, handshake, api, login_start))]
async fn handle_login<T: MinecraftServerHandle>(
client_stream: &mut TcpStream,
handshake: &Handshake,
@ -304,13 +304,16 @@ where
&handshake.get_server_address(),
&handshake.server_port.get_value().to_string(),
)
.await
.map_err(|e| e.set_level(tracing::Level::WARN))?;
.await;
let status = server.query_status().await?;
let status = match server.as_ref() {
Ok(x) => x.query_status().await?,
Err(e) => ServerDeploymentStatus::Unavailable(e.get_kind().to_string()),
};
tracing::debug!(msg = "server status", status = ?status);
match status {
ServerDeploymentStatus::Connectable(mut server_stream) => {
let server = server?;
api.start_watch(server.clone(), OFFLINE_TIMER).await?;
// referenced from:
@ -357,14 +360,18 @@ where
}
}
ServerDeploymentStatus::PodOk | ServerDeploymentStatus::Starting => {
tracing::info!(?status, "server is starting... disconnecting client");
mc_server::send_disconnect(client_stream, format!("[\"\",{{\"text\":\"The server is still starting up...\n wait a bit more please ^^\n\n\"}},{{\"text\":\"{BYE_MESSAGE}\"}}]").as_str()).await?;
}
ServerDeploymentStatus::Offline => {
let server = server?;
server.start().await?;
api.start_watch(server.clone(), OFFLINE_TIMER).await?;
mc_server::send_disconnect(client_stream, format!("[\"\",{{\"text\":\"Okayy, §2starting§r the server!\n\n\"}},{{\"text\":\"{BYE_MESSAGE}\"}}]").as_str()).await?;
}
ServerDeploymentStatus::Unavailable(_) => unreachable!(),
ServerDeploymentStatus::Unavailable(_) => {
tracing::info!(?status, "tried connecting, droppping connection");
}
}
Ok(())
}