Merge pull request #6 from Arikatsu/development

Add config option to disable logging for looping packets
Melledy · Nov 28, 2023 · 6f631dd · 6f631dd
2 parents 55ff4c1 + c713cf0
commit 6f631dd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/src/main/java/emu/lunarcore/Config.java b/src/main/java/emu/lunarcore/Config.java
@@ -130,6 +130,7 @@ public static class LogOptions {
         public boolean commands = true;
         public boolean connections = true;
         public boolean packets = false;
+        public boolean filterLoopingPackets = false;
     }
 
     @Getter

diff --git a/src/main/java/emu/lunarcore/server/game/GameSession.java b/src/main/java/emu/lunarcore/server/game/GameSession.java
@@ -127,6 +127,10 @@ public void onMessage(ByteBuf packet) {
 
                 // Log packet
                 if (LunarCore.getConfig().getLogOptions().packets) {
+                    if (LunarCore.getConfig().getLogOptions().filterLoopingPackets && CmdIdUtils.LOOP_PACKETS.contains(opcode)) {
+                        return;
+                    }
+
                     logPacket("RECV", opcode, data);
                 }
 
@@ -152,6 +156,10 @@ public void send(BasePacket packet) {
 
         // Log
         if (LunarCore.getConfig().getLogOptions().packets) {
+            if (LunarCore.getConfig().getLogOptions().filterLoopingPackets && CmdIdUtils.LOOP_PACKETS.contains(packet.getOpcode())) {
+                return;
+            }
+
             logPacket("SEND", packet.getOpcode(), packet.getData());
         }
     }
@@ -167,6 +175,10 @@ public void send(int cmdId) {
 
             // Log
             if (LunarCore.getConfig().getLogOptions().packets) {
+                if (LunarCore.getConfig().getLogOptions().filterLoopingPackets && CmdIdUtils.LOOP_PACKETS.contains(cmdId)) {
+                    return;
+                }
+
                 logPacket("SEND", cmdId, null);
             }
         }

diff --git a/src/main/java/emu/lunarcore/server/packet/CmdIdUtils.java b/src/main/java/emu/lunarcore/server/packet/CmdIdUtils.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
@@ -14,6 +15,13 @@
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public class CmdIdUtils {
+    public static final Set<Integer> LOOP_PACKETS = Set.of(
+        CmdId.PlayerHeartBeatCsReq,
+        CmdId.PlayerHeartBeatScRsp,
+        CmdId.SceneEntityMoveCsReq,
+        CmdId.SceneEntityMoveScRsp
+    );
+
     private static Int2ObjectMap<String> opcodeMap;
 
     static {