xinyin025/new-api
1
0
Fork 0
mirror of https://github.com/linux-do/new-api.git synced 2025-09-18 00:16:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: 在重试时打印重试信息

Browse Source
This commit is contained in:
CaIon 2024-04-20 17:18:14 +08:00
parent e6765ef32d
commit b8fb351fd8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
controller/relay.go
View File

@ -15,6 +15,7 @@ import (
"one-api/relay/constant" "one-api/relay/constant"
relayconstant "one-api/relay/constant" relayconstant "one-api/relay/constant"
"one-api/service" "one-api/service"
"strings"
) )
func relayHandler(c *gin.Context, relayMode int) *dto.OpenAIErrorWithStatusCode { func relayHandler(c *gin.Context, relayMode int) *dto.OpenAIErrorWithStatusCode {
@ -42,7 +43,7 @@ func Relay(c *gin.Context) {
group := c.GetString("group") group := c.GetString("group")
originalModel := c.GetString("original_model") originalModel := c.GetString("original_model")
openaiErr := relayHandler(c, relayMode) openaiErr := relayHandler(c, relayMode)
retryLogStr := fmt.Sprintf("重试：%d", channelId) useChannel := []int{channelId}
if openaiErr != nil { if openaiErr != nil {
go processChannelError(c, channelId, openaiErr) go processChannelError(c, channelId, openaiErr)
} else { } else {
@ -55,7 +56,7 @@ func Relay(c *gin.Context) {
break break
} }
channelId = channel.Id channelId = channel.Id
retryLogStr += fmt.Sprintf("->%d", channel.Id) useChannel = append(useChannel, channelId)
common.LogInfo(c.Request.Context(), fmt.Sprintf("using channel #%d to retry (remain times %d)", channel.Id, i)) common.LogInfo(c.Request.Context(), fmt.Sprintf("using channel #%d to retry (remain times %d)", channel.Id, i))
middleware.SetupContextForSelectedChannel(c, channel, originalModel) middleware.SetupContextForSelectedChannel(c, channel, originalModel)
@ -66,7 +67,10 @@ func Relay(c *gin.Context) {
go processChannelError(c, channelId, openaiErr) go processChannelError(c, channelId, openaiErr)
} }
} }
if len(useChannel) > 1 {
retryLogStr := fmt.Sprintf("重试：%s", strings.Trim(strings.Join(strings.Fields(fmt.Sprint(useChannel)), "->"), "[]"))
common.LogInfo(c.Request.Context(), retryLogStr) common.LogInfo(c.Request.Context(), retryLogStr)
}
if openaiErr != nil { if openaiErr != nil {
if openaiErr.StatusCode == http.StatusTooManyRequests { if openaiErr.StatusCode == http.StatusTooManyRequests {