mirror of
https://github.com/router-for-me/CLIProxyAPI.git
synced 2026-02-02 20:40:52 +08:00
fix(handlers): preserve upstream response logs before duplicate detection
This commit is contained in:
@@ -618,28 +618,21 @@ func (h *BaseAPIHandler) WriteErrorResponse(c *gin.Context, msg *interfaces.Erro
|
|||||||
}
|
}
|
||||||
|
|
||||||
body := BuildErrorResponseBody(status, errText)
|
body := BuildErrorResponseBody(status, errText)
|
||||||
// Check if this error was already recorded by the executor (to avoid duplicate logging)
|
// Append first to preserve upstream response logs, then drop duplicate payloads if already recorded.
|
||||||
// The executor logs raw error text, so match errText before falling back to the JSON body.
|
var previous []byte
|
||||||
shouldAppend := true
|
|
||||||
if existing, exists := c.Get("API_RESPONSE"); exists {
|
if existing, exists := c.Get("API_RESPONSE"); exists {
|
||||||
if existingBytes, ok := existing.([]byte); ok && len(existingBytes) > 0 {
|
if existingBytes, ok := existing.([]byte); ok && len(existingBytes) > 0 {
|
||||||
trimmedErrText := strings.TrimSpace(errText)
|
previous = bytes.Clone(existingBytes)
|
||||||
if trimmedErrText != "" && bytes.Contains(existingBytes, []byte(trimmedErrText)) {
|
|
||||||
// Error already logged by executor, skip appending
|
|
||||||
shouldAppend = false
|
|
||||||
} else {
|
|
||||||
trimmedBody := bytes.TrimSpace(body)
|
|
||||||
if len(trimmedBody) > 0 && bytes.Contains(existingBytes, trimmedBody) {
|
|
||||||
// Error already logged by executor, skip appending
|
|
||||||
shouldAppend = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if shouldAppend {
|
appendAPIResponse(c, body)
|
||||||
// Use appendAPIResponse to preserve any previously captured API response data
|
trimmedErrText := strings.TrimSpace(errText)
|
||||||
// (such as formatted upstream response logs from logging_helpers.go)
|
trimmedBody := bytes.TrimSpace(body)
|
||||||
appendAPIResponse(c, body)
|
if len(previous) > 0 {
|
||||||
|
if (trimmedErrText != "" && bytes.Contains(previous, []byte(trimmedErrText))) ||
|
||||||
|
(len(trimmedBody) > 0 && bytes.Contains(previous, trimmedBody)) {
|
||||||
|
c.Set("API_RESPONSE", previous)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if !c.Writer.Written() {
|
if !c.Writer.Written() {
|
||||||
|
|||||||
Reference in New Issue
Block a user