majjo/Pumpkin
1
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Pumpkin.git synced 2026-08-31 08:22:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: replace log with tracing (#1460)

Browse Source 
* feat: replace log with tracing

* chore: clippy

* fix: revert replacing println!-calls

* fix: await async construct

* fix: lints + incorrect await

* fix: each plugin spawns their own tracing-subscriber

* fix: replace info! with println for commands

* chore: remove env_logger

* fix: added TODO about structured logging
This commit is contained in:
FabseGP
2026-02-13 21:10:13 +00:00
committed by GitHub
parent bb75b783fd
commit 24ea53b2e9
66 changed files with 569 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pumpkin/src/net/java/mod.rs
View File

@@ -52,6 +52,7 @@ use tokio::{
};
use tokio_util::sync::CancellationToken;
use tokio_util::task::TaskTracker;
use tracing::{debug, error, warn};
pub mod config;
pub mod handshake;
@@ -163,7 +164,7 @@ impl JavaClient {
pub async fn set_compression(&self, compression: CompressionInfo) {
if compression.level > 9 {
log::error!("Invalid compression level! Clients will not be able to read this!");
error!("Invalid compression level! Clients will not be able to read this!");
}
self.network_reader
@@ -200,10 +201,9 @@ impl JavaClient {
}
Err(error) => {
let text = format!("Error while reading incoming packet {error}");
log::debug!(
debug!(
"Failed to read incoming packet with id {}: {}",
packet.id,
error
packet.id, error
);
self.kick(TextComponent::text(text)).await;
}
@@ -276,10 +276,9 @@ impl JavaClient {
{
// This is expected to fail if we are closed
if !self.close_token.is_cancelled() {
log::error!(
error!(
"Failed to add packet to the outgoing packet queue for client {}: {}",
self.id,
err
self.id, err
);
}
}
@@ -293,7 +292,7 @@ impl JavaClient {
let mut network_reader = self.network_reader.lock().await;
tokio::select! {
() = self.await_close_interrupt() => {
log::debug!("Canceling player packet processing");
debug!("Canceling player packet processing");
None
},
packet_result = network_reader.get_raw_packet() => {
@@ -301,7 +300,7 @@ impl JavaClient {
Ok(packet) => Some(packet),
Err(err) => {
if !matches!(err, PacketDecodeError::ConnectionClosed) {
log::warn!("Failed to decode packet from client {}: {}", self.id, err);
warn!("Failed to decode packet from client {}: {}", self.id, err);
let text = format!("Error while reading incoming packet {err}");
self.kick(TextComponent::text(text)).await;
}
@@ -328,7 +327,7 @@ impl JavaClient {
ConnectionState::Play => self.send_packet_now(&CPlayDisconnect::new(&reason)).await,
_ => {}
}
log::debug!("Closing connection for {}", self.id);
debug!("Closing connection for {}", self.id);
self.close();
}
@@ -349,10 +348,9 @@ impl JavaClient {
{
// It is expected that the packet will fail if we are closed
if !self.close_token.is_cancelled() {
log::warn!(
warn!(
"Failed to add high-priority packet to the outgoing packet queue for client {}: {}",
self.id,
err
self.id, err
);
// We now need to close the connection to the client since the stream is in an
// unknown state
@@ -439,7 +437,7 @@ impl JavaClient {
&self,
packet: &RawPacket,
) -> Result<Option<PacketHandlerResult>, ReadingError> {
log::debug!("Handling handshake group");
debug!("Handling handshake group");
let payload = &packet.payload[..];
match packet.id {
0 => {
@@ -458,7 +456,7 @@ impl JavaClient {
server: &Server,
packet: &RawPacket,
) -> Result<Option<PacketHandlerResult>, ReadingError> {
log::debug!("Handling status group");
debug!("Handling status group");
let payload = &packet.payload[..];
match packet.id {
id if id == SStatusRequest::PACKET_ID => {
@@ -529,7 +527,7 @@ impl JavaClient {
send_failed = true;
// It is expected that the packet will fail if we are closed
if !close_token.is_cancelled() {
log::warn!("Failed to send packet to client {id}: {err}");
warn!("Failed to send packet to client {id}: {err}");
}
break;
}
@@ -538,7 +536,7 @@ impl JavaClient {
if !send_failed && let Err(err) = writer.flush().await {
send_failed = true;
if !close_token.is_cancelled() {
log::warn!("Failed to flush packet batch for client {id}: {err}");
warn!("Failed to flush packet batch for client {id}: {err}");
}
}
drop(writer);
@@ -580,7 +578,7 @@ impl JavaClient {
server: &Server,
packet: &RawPacket,
) -> Result<Option<PacketHandlerResult>, ReadingError> {
log::debug!("Handling login group for id");
debug!("Handling login group for id");
let payload = &packet.payload[..];
match packet.id {
id if id == SLoginStart::PACKET_ID => {
@@ -602,7 +600,7 @@ impl JavaClient {
self.handle_login_cookie_response(&SLoginCookieResponse::read(payload)?);
}
_ => {
log::error!(
error!(
"Failed to handle java client packet id {} in Login State",
packet.id
);
@@ -616,7 +614,7 @@ impl JavaClient {
server: &Arc<Server>,
packet: &RawPacket,
) -> Result<Option<PacketHandlerResult>, ReadingError> {
log::debug!("Handling config group for id {}", packet.id);
debug!("Handling config group for id {}", packet.id);
let payload = &packet.payload[..];
match packet.id {
@@ -642,7 +640,7 @@ impl JavaClient {
.await;
}
_ => {
log::error!(
error!(
"Failed to handle java client packet id {} in Config State",
packet.id
);
@@ -800,7 +798,7 @@ impl JavaClient {
server.plugin_manager.fire(event).await;
}
_ => {
log::warn!("Failed to handle player packet id {}", packet.id);
warn!("Failed to handle player packet id {}", packet.id);
}
}
Ok(())