Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
new-api
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
3c30b7c4
authored
Aug 16, 2025
by
CaIon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: refactor processChannelError to use goroutine for asynchronous handling
parent
22125a6d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
31 deletions
+36
-31
controller/channel-test.go
+1
-1
controller/relay.go
+35
-30
No files found.
controller/channel-test.go
View file @
3c30b7c4
...
@@ -445,7 +445,7 @@ func testAllChannels(notify bool) error {
...
@@ -445,7 +445,7 @@ func testAllChannels(notify bool) error {
// disable channel
// disable channel
if
isChannelEnabled
&&
shouldBanChannel
&&
channel
.
GetAutoBan
()
{
if
isChannelEnabled
&&
shouldBanChannel
&&
channel
.
GetAutoBan
()
{
go
processChannelError
(
result
.
context
,
*
types
.
NewChannelError
(
channel
.
Id
,
channel
.
Type
,
channel
.
Name
,
channel
.
ChannelInfo
.
IsMultiKey
,
common
.
GetContextKeyString
(
result
.
context
,
constant
.
ContextKeyChannelKey
),
channel
.
GetAutoBan
()),
newAPIError
)
processChannelError
(
result
.
context
,
*
types
.
NewChannelError
(
channel
.
Id
,
channel
.
Type
,
channel
.
Name
,
channel
.
ChannelInfo
.
IsMultiKey
,
common
.
GetContextKeyString
(
result
.
context
,
constant
.
ContextKeyChannelKey
),
channel
.
GetAutoBan
()),
newAPIError
)
}
}
// enable channel
// enable channel
...
...
controller/relay.go
View file @
3c30b7c4
...
@@ -3,6 +3,7 @@ package controller
...
@@ -3,6 +3,7 @@ package controller
import
(
import
(
"bytes"
"bytes"
"fmt"
"fmt"
"github.com/bytedance/gopkg/util/gopool"
"io"
"io"
"log"
"log"
"net/http"
"net/http"
...
@@ -61,8 +62,8 @@ func geminiRelayHandler(c *gin.Context, info *relaycommon.RelayInfo) *types.NewA
...
@@ -61,8 +62,8 @@ func geminiRelayHandler(c *gin.Context, info *relaycommon.RelayInfo) *types.NewA
func
Relay
(
c
*
gin
.
Context
,
relayFormat
types
.
RelayFormat
)
{
func
Relay
(
c
*
gin
.
Context
,
relayFormat
types
.
RelayFormat
)
{
requestId
:=
c
.
GetString
(
common
.
RequestIdKey
)
requestId
:=
c
.
GetString
(
common
.
RequestIdKey
)
group
:=
c
.
GetString
(
"group"
)
group
:=
c
ommon
.
GetContextKeyString
(
c
,
constant
.
ContextKeyUsingGroup
)
originalModel
:=
c
.
GetString
(
"original_model"
)
originalModel
:=
c
ommon
.
GetContextKeyString
(
c
,
constant
.
ContextKeyOriginalModel
)
var
(
var
(
newAPIError
*
types
.
NewAPIError
newAPIError
*
types
.
NewAPIError
...
@@ -172,35 +173,9 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {
...
@@ -172,35 +173,9 @@ func Relay(c *gin.Context, relayFormat types.RelayFormat) {
if
newAPIError
==
nil
{
if
newAPIError
==
nil
{
return
return
}
else
{
if
constant
.
ErrorLogEnabled
&&
types
.
IsRecordErrorLog
(
newAPIError
)
{
// 保存错误日志到mysql中
userId
:=
c
.
GetInt
(
"id"
)
tokenName
:=
c
.
GetString
(
"token_name"
)
modelName
:=
c
.
GetString
(
"original_model"
)
tokenId
:=
c
.
GetInt
(
"token_id"
)
userGroup
:=
c
.
GetString
(
"group"
)
channelId
:=
c
.
GetInt
(
"channel_id"
)
other
:=
make
(
map
[
string
]
interface
{})
other
[
"error_type"
]
=
newAPIError
.
GetErrorType
()
other
[
"error_code"
]
=
newAPIError
.
GetErrorCode
()
other
[
"status_code"
]
=
newAPIError
.
StatusCode
other
[
"channel_id"
]
=
channelId
other
[
"channel_name"
]
=
c
.
GetString
(
"channel_name"
)
other
[
"channel_type"
]
=
c
.
GetInt
(
"channel_type"
)
adminInfo
:=
make
(
map
[
string
]
interface
{})
adminInfo
[
"use_channel"
]
=
c
.
GetStringSlice
(
"use_channel"
)
isMultiKey
:=
common
.
GetContextKeyBool
(
c
,
constant
.
ContextKeyChannelIsMultiKey
)
if
isMultiKey
{
adminInfo
[
"is_multi_key"
]
=
true
adminInfo
[
"multi_key_index"
]
=
common
.
GetContextKeyInt
(
c
,
constant
.
ContextKeyChannelMultiKeyIndex
)
}
other
[
"admin_info"
]
=
adminInfo
model
.
RecordErrorLog
(
c
,
userId
,
channelId
,
modelName
,
tokenName
,
newAPIError
.
MaskSensitiveError
(),
tokenId
,
0
,
false
,
userGroup
,
other
)
}
}
}
go
processChannelError
(
c
,
*
types
.
NewChannelError
(
channel
.
Id
,
channel
.
Type
,
channel
.
Name
,
channel
.
ChannelInfo
.
IsMultiKey
,
common
.
GetContextKeyString
(
c
,
constant
.
ContextKeyChannelKey
),
channel
.
GetAutoBan
()),
newAPIError
)
processChannelError
(
c
,
*
types
.
NewChannelError
(
channel
.
Id
,
channel
.
Type
,
channel
.
Name
,
channel
.
ChannelInfo
.
IsMultiKey
,
common
.
GetContextKeyString
(
c
,
constant
.
ContextKeyChannelKey
),
channel
.
GetAutoBan
()),
newAPIError
)
if
!
shouldRetry
(
c
,
newAPIError
,
common
.
RetryTimes
-
i
)
{
if
!
shouldRetry
(
c
,
newAPIError
,
common
.
RetryTimes
-
i
)
{
break
break
...
@@ -298,12 +273,42 @@ func shouldRetry(c *gin.Context, openaiErr *types.NewAPIError, retryTimes int) b
...
@@ -298,12 +273,42 @@ func shouldRetry(c *gin.Context, openaiErr *types.NewAPIError, retryTimes int) b
}
}
func
processChannelError
(
c
*
gin
.
Context
,
channelError
types
.
ChannelError
,
err
*
types
.
NewAPIError
)
{
func
processChannelError
(
c
*
gin
.
Context
,
channelError
types
.
ChannelError
,
err
*
types
.
NewAPIError
)
{
logger
.
LogError
(
c
,
fmt
.
Sprintf
(
"relay error (channel #%d, status code: %d): %s"
,
channelError
.
ChannelId
,
err
.
StatusCode
,
err
.
Error
()))
gopool
.
Go
(
func
()
{
// 不要使用context获取渠道信息,异步处理时可能会出现渠道信息不一致的情况
// 不要使用context获取渠道信息,异步处理时可能会出现渠道信息不一致的情况
// do not use context to get channel info, there may be inconsistent channel info when processing asynchronously
// do not use context to get channel info, there may be inconsistent channel info when processing asynchronously
logger
.
LogError
(
c
,
fmt
.
Sprintf
(
"relay error (channel #%d, status code: %d): %s"
,
channelError
.
ChannelId
,
err
.
StatusCode
,
err
.
Error
()))
if
service
.
ShouldDisableChannel
(
channelError
.
ChannelId
,
err
)
&&
channelError
.
AutoBan
{
if
service
.
ShouldDisableChannel
(
channelError
.
ChannelId
,
err
)
&&
channelError
.
AutoBan
{
service
.
DisableChannel
(
channelError
,
err
.
Error
())
service
.
DisableChannel
(
channelError
,
err
.
Error
())
}
}
})
if
constant
.
ErrorLogEnabled
&&
types
.
IsRecordErrorLog
(
err
)
{
// 保存错误日志到mysql中
userId
:=
c
.
GetInt
(
"id"
)
tokenName
:=
c
.
GetString
(
"token_name"
)
modelName
:=
c
.
GetString
(
"original_model"
)
tokenId
:=
c
.
GetInt
(
"token_id"
)
userGroup
:=
c
.
GetString
(
"group"
)
channelId
:=
c
.
GetInt
(
"channel_id"
)
other
:=
make
(
map
[
string
]
interface
{})
other
[
"error_type"
]
=
err
.
GetErrorType
()
other
[
"error_code"
]
=
err
.
GetErrorCode
()
other
[
"status_code"
]
=
err
.
StatusCode
other
[
"channel_id"
]
=
channelId
other
[
"channel_name"
]
=
c
.
GetString
(
"channel_name"
)
other
[
"channel_type"
]
=
c
.
GetInt
(
"channel_type"
)
adminInfo
:=
make
(
map
[
string
]
interface
{})
adminInfo
[
"use_channel"
]
=
c
.
GetStringSlice
(
"use_channel"
)
isMultiKey
:=
common
.
GetContextKeyBool
(
c
,
constant
.
ContextKeyChannelIsMultiKey
)
if
isMultiKey
{
adminInfo
[
"is_multi_key"
]
=
true
adminInfo
[
"multi_key_index"
]
=
common
.
GetContextKeyInt
(
c
,
constant
.
ContextKeyChannelMultiKeyIndex
)
}
other
[
"admin_info"
]
=
adminInfo
model
.
RecordErrorLog
(
c
,
userId
,
channelId
,
modelName
,
tokenName
,
err
.
MaskSensitiveError
(),
tokenId
,
0
,
false
,
userGroup
,
other
)
}
}
}
func
RelayMidjourney
(
c
*
gin
.
Context
)
{
func
RelayMidjourney
(
c
*
gin
.
Context
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment