feat(mcphost): optimize shutdown logging to avoid false error messages

- Add identification for normal shutdown pipe errors in startStdioLog
- Optimize stdio log error handling logic to distinguish between normal shutdown and actual errors
- Add proper handling for SIGTERM (exit status 143) in isSignalError function
- Add debug logging for MCP config loading process
- Ensure clean shutdown without confusing error messages
This commit is contained in:
lilong.129
2025-06-03 13:21:38 +08:00
parent 184081592c
commit 37028c4263
3 changed files with 23 additions and 3 deletions

View File

@@ -1 +1 @@
v5.0.0-beta-2506021152
v5.0.0-beta-2506031321

View File

@@ -5,6 +5,8 @@ import (
"fmt"
"os"
"path/filepath"
"github.com/rs/zerolog/log"
)
const (
@@ -93,6 +95,7 @@ func (w ServerConfigWrapper) MarshalJSON() ([]byte, error) {
// LoadMCPConfig loads the MCP configuration from the specified path or default location
func LoadMCPConfig(configPath string) (*MCPConfig, error) {
log.Debug().Str("configPath", configPath).Msg("Loading MCP config")
if configPath == "" {
homeDir, err := os.UserHomeDir()
if err != nil {
@@ -122,6 +125,7 @@ func LoadMCPConfig(configPath string) (*MCPConfig, error) {
return nil, fmt.Errorf("error parsing config file: %w", err)
}
config.ConfigPath = configPath
log.Debug().Str("configPath", configPath).
Interface("config", config).Msg("Loaded MCP config")
return &config, nil
}

View File

@@ -228,6 +228,7 @@ func isSignalError(err error) bool {
strings.Contains(errStr, "signal: terminated") ||
strings.Contains(errStr, "exit status 120") ||
strings.Contains(errStr, "exit status 130") ||
strings.Contains(errStr, "exit status 143") || // SIGTERM (15)
strings.Contains(errStr, "broken pipe") ||
strings.Contains(errStr, "connection reset")
}
@@ -472,7 +473,12 @@ func startStdioLog(stderr io.Reader, serverName string, ctx context.Context) {
} else {
// Scanner finished or encountered error
if err := scanner.Err(); err != nil {
log.Debug().Str("server", serverName).Err(err).Msg("stdio log scanner error")
// Check if it's a normal shutdown error (pipe closed)
if isNormalShutdownError(err) {
log.Debug().Str("server", serverName).Msg("stdio log stopped due to normal shutdown")
} else {
log.Debug().Str("server", serverName).Err(err).Msg("stdio log scanner error")
}
}
return
}
@@ -481,6 +487,16 @@ func startStdioLog(stderr io.Reader, serverName string, ctx context.Context) {
}()
}
// isNormalShutdownError checks if the error is caused by normal shutdown (pipe closed)
func isNormalShutdownError(err error) bool {
errStr := err.Error()
// Common pipe closed error patterns during normal shutdown
return strings.Contains(errStr, "file already closed") ||
strings.Contains(errStr, "broken pipe") ||
strings.Contains(errStr, "use of closed file") ||
strings.Contains(errStr, "read/write on closed pipe")
}
// prepareClientInitRequest creates a standard initialization request
func prepareClientInitRequest() mcp.InitializeRequest {
return mcp.InitializeRequest{