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
d9107379
authored
Jan 07, 2024
by
CaIon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: fix gemini panic
parent
171315e6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
1 deletions
+35
-1
middleware/recover.go
+28
-0
model/usedata.go
+6
-0
router/relay-router.go
+1
-1
No files found.
middleware/recover.go
0 → 100644
View file @
d9107379
package
middleware
import
(
"fmt"
"github.com/gin-gonic/gin"
"net/http"
"one-api/common"
"runtime/debug"
)
func
RelayPanicRecover
()
gin
.
HandlerFunc
{
return
func
(
c
*
gin
.
Context
)
{
defer
func
()
{
if
err
:=
recover
();
err
!=
nil
{
common
.
SysError
(
fmt
.
Sprintf
(
"panic detected: %v"
,
err
))
common
.
SysError
(
fmt
.
Sprintf
(
"stacktrace from panic: %s"
,
string
(
debug
.
Stack
())))
c
.
JSON
(
http
.
StatusInternalServerError
,
gin
.
H
{
"error"
:
gin
.
H
{
"message"
:
fmt
.
Sprintf
(
"Panic detected, error: %v. Please submit a issue here: https://github.com/songquanpeng/one-api"
,
err
),
"type"
:
"one_api_panic"
,
},
})
c
.
Abort
()
}
}()
c
.
Next
()
}
}
model/usedata.go
View file @
d9107379
...
@@ -18,6 +18,12 @@ type QuotaData struct {
...
@@ -18,6 +18,12 @@ type QuotaData struct {
}
}
func
UpdateQuotaData
()
{
func
UpdateQuotaData
()
{
// recover
defer
func
()
{
if
r
:=
recover
();
r
!=
nil
{
common
.
SysLog
(
fmt
.
Sprintf
(
"UpdateQuotaData panic: %s"
,
r
))
}
}()
for
{
for
{
if
common
.
DataExportEnabled
{
if
common
.
DataExportEnabled
{
common
.
SysLog
(
"正在更新数据看板数据..."
)
common
.
SysLog
(
"正在更新数据看板数据..."
)
...
...
router/relay-router.go
View file @
d9107379
...
@@ -17,7 +17,7 @@ func SetRelayRouter(router *gin.Engine) {
...
@@ -17,7 +17,7 @@ func SetRelayRouter(router *gin.Engine) {
modelsRouter
.
GET
(
"/:model"
,
controller
.
RetrieveModel
)
modelsRouter
.
GET
(
"/:model"
,
controller
.
RetrieveModel
)
}
}
relayV1Router
:=
router
.
Group
(
"/v1"
)
relayV1Router
:=
router
.
Group
(
"/v1"
)
relayV1Router
.
Use
(
middleware
.
TokenAuth
(),
middleware
.
Distribute
())
relayV1Router
.
Use
(
middleware
.
RelayPanicRecover
(),
middleware
.
TokenAuth
(),
middleware
.
Distribute
())
{
{
relayV1Router
.
POST
(
"/completions"
,
controller
.
Relay
)
relayV1Router
.
POST
(
"/completions"
,
controller
.
Relay
)
relayV1Router
.
POST
(
"/chat/completions"
,
controller
.
Relay
)
relayV1Router
.
POST
(
"/chat/completions"
,
controller
.
Relay
)
...
...
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