Skip to content

Commit 2cb20b3

Browse files
author
“â黄可欣
committed
修改client和server部分日志输出
1 parent 9d5e552 commit 2cb20b3

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

framework/fel/java/plugins/tool-mcp-client/src/main/java/modelengine/fel/tool/mcp/client/support/DefaultMcpStreamableClient.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,19 @@ public List<Tool> getTools() {
115115
try {
116116
McpSchema.ListToolsResult result = this.mcpSyncClient.listTools();
117117
if (result == null || result.tools() == null) {
118-
log.warn("Failed to get tools: result is null. [clientId={}]", clientId);
119-
throw new IllegalStateException("Failed to get tools from MCP server: result is null.");
118+
log.warn("Failed to get tools list: result is null. [clientId={}]", clientId);
119+
throw new IllegalStateException("Failed to get tools list from MCP server: result is null.");
120120
}
121121

122122
List<Tool> tools = result.tools().stream().map(this::convertToFelTool).collect(Collectors.toList());
123123

124-
log.info("Successfully retrieved tools. [clientId={}, count={}]", clientId, tools.size());
124+
log.info("Successfully retrieved tools list. [clientId={}, count={}]", clientId, tools.size());
125125
tools.forEach(tool -> log.debug("Tool information. [name={}, description={}]",
126126
tool.getName(),
127127
tool.getDescription()));
128128
return tools;
129129
} catch (Exception e) {
130-
log.error("Failed to get tools. [clientId={}, error={}]", clientId, e.getMessage());
130+
log.error("Failed to get tools list. [clientId={}, error={}]", clientId, e.getMessage());
131131
throw new IllegalStateException("Failed to get tools from MCP server. [error=" + e.getMessage() + "]", e);
132132
}
133133
}
@@ -251,7 +251,7 @@ private Tool convertToFelTool(McpSchema.Tool mcpTool) {
251251
*/
252252
private void ensureNotClosed() {
253253
if (this.closed) {
254-
throw new IllegalStateException("The MCP client is closed. [clientId=" + clientId + "]");
254+
throw new IllegalStateException("The MCP client is already closed. [clientId=" + clientId + "]");
255255
}
256256
}
257257

@@ -264,7 +264,7 @@ private void ensureReady() {
264264
ensureNotClosed();
265265
if (!this.initialized) {
266266
throw new IllegalStateException(
267-
"MCP client is not initialized. Please wait a moment. [clientId=" + clientId + "]");
267+
"MCP client is not initialized. [clientId=" + clientId + "]");
268268
}
269269
}
270270

framework/fel/java/plugins/tool-mcp-server/src/main/java/modelengine/fel/tool/mcp/server/transport/FitMcpStreamableServerTransportProvider.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public Object handleGet(HttpClassicServerRequest request, HttpClassicServerRespo
204204
}
205205
String sessionId = request.headers().first(HttpHeaders.MCP_SESSION_ID).orElse("");
206206
McpStreamableServerSession session = this.sessions.get(sessionId);
207-
logger.info("[GET] Handling GET request for session: {}", sessionId);
207+
logger.info("[GET] Receiving GET request from session: {}", sessionId);
208208

209209
McpTransportContext transportContext = this.contextExtractor.extract(request);
210210
try {
@@ -392,7 +392,7 @@ private void handleReplaySseRequest(HttpClassicServerRequest request, McpTranspo
392392
String sessionId, McpStreamableServerSession session, FitStreamableMcpSessionTransport sessionTransport,
393393
Emitter<TextEvent> emitter) {
394394
String lastId = request.headers().first(HttpHeaders.LAST_EVENT_ID).orElse("0");
395-
logger.info("[GET] Receiving replay request from session: {}", sessionId);
395+
logger.info("[GET] Handling replay request from session: {}", sessionId);
396396

397397
try {
398398
session.replay(lastId)
@@ -426,7 +426,7 @@ private void handleReplaySseRequest(HttpClassicServerRequest request, McpTranspo
426426
*/
427427
private void handleEstablishSseRequest(String sessionId, McpStreamableServerSession session,
428428
FitStreamableMcpSessionTransport sessionTransport, Emitter<TextEvent> emitter) {
429-
logger.info("[GET] Receiving Get request to establish new SSE for session: {}", sessionId);
429+
logger.info("[GET] Handling Get request to establish new SSE for session: {}", sessionId);
430430
McpStreamableServerSession.McpStreamableServerSessionStream listeningStream =
431431
session.listeningStream(sessionTransport);
432432

@@ -643,7 +643,7 @@ private class FitStreamableMcpSessionTransport implements McpStreamableServerTra
643643
this.sessionId = sessionId;
644644
this.emitter = emitter;
645645
this.response = response;
646-
logger.info("[SSE] Building SSE for session: {} ", sessionId);
646+
logger.info("[SSE] Building SSE emitter for session: {} ", sessionId);
647647
}
648648

649649
/**

0 commit comments

Comments
 (0)