fork-it/gpt-load
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 日志错误格式修复

Browse Source
This commit is contained in:
tbphp
2025-07-12 11:22:01 +08:00
parent b3b1769411
commit 25d65b0a94
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/proxy/server.go
View File

@@ -109,10 +109,14 @@ func (ps *ProxyServer) executeRequestWithRetry(
} else {
response.Error(c, app_errors.NewAPIErrorWithUpstream(lastError.StatusCode, "UPSTREAM_ERROR", lastError.ErrorMessage))
}
logrus.Debugf("Max retries exceeded for group %s after %d attempts. Parsed Error: %s", group.Name, retryCount, lastError.ErrorMessage)
logMessage := lastError.ParsedErrorMessage
if logMessage == "" {
logMessage = lastError.ErrorMessage
}
logrus.Debugf("Max retries exceeded for group %s after %d attempts. Parsed Error: %s", group.Name, retryCount, logMessage)
keyID, _ := strconv.ParseUint(lastError.KeyID, 10, 64)
ps.logRequest(c, group, uint(keyID), startTime, lastError.StatusCode, retryCount, errors.New(lastError.ErrorMessage))
ps.logRequest(c, group, uint(keyID), startTime, lastError.StatusCode, retryCount, errors.New(logMessage))
} else {
response.Error(c, app_errors.ErrMaxRetriesExceeded)
logrus.Debugf("Max retries exceeded for group %s after %d attempts.", group.Name, retryCount)
@@ -203,10 +207,11 @@ func (ps *ProxyServer) executeRequestWithRetry(
}
newRetryErrors := append(retryErrors, types.RetryError{
StatusCode: statusCode,
ErrorMessage: errorMessage,
KeyID: fmt.Sprintf("%d", apiKey.ID),
Attempt: retryCount + 1,
StatusCode: statusCode,
ErrorMessage: errorMessage,
ParsedErrorMessage: parsedError,
KeyID: fmt.Sprintf("%d", apiKey.ID),
Attempt: retryCount + 1,
})
ps.executeRequestWithRetry(c, channelHandler, group, bodyBytes, isStream, startTime, retryCount+1, newRetryErrors)
return

9
internal/types/types.go
View File

@@ -79,8 +79,9 @@ type DatabaseConfig struct {
}
type RetryError struct {
StatusCode int `json:"status_code"`
ErrorMessage string `json:"error_message"`
KeyID string `json:"key_id"`
Attempt int `json:"attempt"`
StatusCode int `json:"status_code"`
ErrorMessage string `json:"error_message"`
ParsedErrorMessage string `json:"-"`
KeyID string `json:"key_id"`
Attempt int `json:"attempt"`
}