Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-19 02:15:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split config debugLevel into logPackets (Game) and logRequests (Dispatch)

Browse Source
This commit is contained in:
Melledy
2022-07-20 02:52:35 -07:00
parent 408fa90728
commit 52ee229e96
7 changed files with 58 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java
View File

@@ -94,7 +94,7 @@ public class GameServerPacketHandler {
}
// Log unhandled packets
if (SERVER.debugLevel == ServerDebugMode.MISSING) {
if (GAME_INFO.logPackets == ServerDebugMode.MISSING) {
Grasscutter.getLogger().info("Unhandled packet (" + opcode + "): " + emu.grasscutter.net.packet.PacketOpcodesUtil.getOpcodeName(opcode));
}
}

63
src/main/java/emu/grasscutter/server/game/GameSession.java
View File

@@ -148,18 +148,23 @@ public class GameSession implements GameSessionManager.KcpChannel {
}
// Log
if (SERVER.debugLevel == ServerDebugMode.ALL) {
if (!loopPacket.contains(packet.getOpcode())) {
logPacket("SEND",packet.getOpcode(), packet.getData());
}
}
if (SERVER.debugLevel == ServerDebugMode.WHITELIST && SERVER.DebugWhitelist.contains(packet.getOpcode())) {
logPacket("SEND",packet.getOpcode(), packet.getData());
}
if (SERVER.debugLevel == ServerDebugMode.BLACKLIST && !(SERVER.DebugBlacklist.contains(packet.getOpcode()))) {
logPacket("SEND",packet.getOpcode(), packet.getData());
switch (GAME_INFO.logPackets) {
case ALL -> {
if (!loopPacket.contains(packet.getOpcode())) {
logPacket("SEND", packet.getOpcode(), packet.getData());
}
}
case WHITELIST-> {
if (SERVER.debugWhitelist.contains(packet.getOpcode())) {
logPacket("SEND", packet.getOpcode(), packet.getData());
}
}
case BLACKLIST-> {
if (!SERVER.debugBlacklist.contains(packet.getOpcode())) {
logPacket("SEND", packet.getOpcode(), packet.getData());
}
}
default -> {}
}
// Invoke event.
@@ -194,7 +199,7 @@ public class GameSession implements GameSessionManager.KcpChannel {
//logPacket(packet);
// Handle
try {
boolean allDebug = SERVER.debugLevel == ServerDebugMode.ALL;
boolean allDebug = GAME_INFO.logPackets == ServerDebugMode.ALL;
while (packet.readableBytes() > 0) {
// Length
if (packet.readableBytes() < 12) {
@@ -225,20 +230,26 @@ public class GameSession implements GameSessionManager.KcpChannel {
}
return; // Bad packet
}
// Log packet
if (allDebug) {
if (!loopPacket.contains(opcode)) {
logPacket("RECV",opcode, payload);
}
}
if (SERVER.debugLevel == ServerDebugMode.WHITELIST && SERVER.DebugWhitelist.contains(opcode)) {
logPacket("RECV",opcode, payload);
}
if (SERVER.debugLevel == ServerDebugMode.BLACKLIST && !(SERVER.DebugBlacklist.contains(opcode))) {
logPacket("RECV",opcode, payload);
}
switch (GAME_INFO.logPackets) {
case ALL -> {
if (!loopPacket.contains(opcode)) {
logPacket("RECV",opcode, payload);
}
}
case WHITELIST-> {
if (SERVER.debugWhitelist.contains(opcode)) {
logPacket("RECV",opcode, payload);
}
}
case BLACKLIST-> {
if (!(SERVER.debugBlacklist.contains(opcode))) {
logPacket("RECV",opcode, payload);
}
}
default -> {}
}
// Handle
getServer().getPacketHandler().handle(this, opcode, header, payload);