Aidar/SHiNE-server
SHA256
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(debug-api): починить сборку после merge и унифицировать буфер debug-логов

Browse Source
This commit is contained in:
AidarKC 2026-04-22 15:03:14 +03:00
parent 6a9746c17a
commit c824fb5e9b
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/server/debug/DebugRunLogBuffer.java → shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/debug/DebugRunLogBuffer.java
View File

@ -1,4 +1,4 @@
package server.debug; package server.logic.ws_protocol.JSON.debug;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import java.util.ArrayList; import java.util.ArrayList;

2
shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/system/Net_ClientDebugLog_Handler.java
View File

@ -2,8 +2,8 @@ package server.logic.ws_protocol.JSON.handlers.system;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import server.debug.DebugRunLogBuffer;
import server.logic.ws_protocol.JSON.ConnectionContext; import server.logic.ws_protocol.JSON.ConnectionContext;
import server.logic.ws_protocol.JSON.debug.DebugRunLogBuffer;
import server.logic.ws_protocol.JSON.entyties.Net_Request; import server.logic.ws_protocol.JSON.entyties.Net_Request;
import server.logic.ws_protocol.JSON.entyties.Net_Response; import server.logic.ws_protocol.JSON.entyties.Net_Response;
import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler; import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;

3
src/main/java/server/debug/DebugClientsServlet.java
View File

@ -18,6 +18,7 @@ import java.net.SocketAddress;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Set;
/** /**
* GET /debug/ws/clients * GET /debug/ws/clients
@ -43,7 +44,7 @@ public class DebugClientsServlet extends HttpServlet {
return; return;
} }
List<ConnectionContext> contexts = ActiveConnectionsRegistry.getInstance().getAllConnectionsSnapshot(); Set<ConnectionContext> contexts = ActiveConnectionsRegistry.getInstance().getAllConnectionsSnapshot();
List<ObjectNode> rows = new ArrayList<>(); List<ObjectNode> rows = new ArrayList<>();
for (ConnectionContext ctx : contexts) { for (ConnectionContext ctx : contexts) {
Session ws = ctx.getWsSession(); Session ws = ctx.getWsSession();

1
src/main/java/server/debug/DebugConnectServlet.java
View File

@ -8,6 +8,7 @@ import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import server.logic.ws_protocol.JSON.ActiveConnectionsRegistry; import server.logic.ws_protocol.JSON.ActiveConnectionsRegistry;
import server.logic.ws_protocol.JSON.ConnectionContext; import server.logic.ws_protocol.JSON.ConnectionContext;
import server.logic.ws_protocol.JSON.debug.DebugRunLogBuffer;
import server.logic.ws_protocol.JSON.push.WsEventSender; import server.logic.ws_protocol.JSON.push.WsEventSender;
import java.io.IOException; import java.io.IOException;

1
src/main/java/server/debug/DebugLogsServlet.java
View File

@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import server.logic.ws_protocol.JSON.debug.DebugRunLogBuffer;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;