Skip to content

phsl / new-api

Go to a project
Commit 74985fa8 by CaIon
Options

fix: keep token log filters exact

parent 1d320373
Showing with 7 additions and 9 deletions
model/log.go
......@@ -329,8 +329,8 @@ func GetAllLogs(logType int, startTimestamp int64, endTimestamp int64, modelName
if tx, err = applyExplicitLogTextFilter(tx, "logs.username", username); err != nil {
return nil, 0, err
}
if tx, err = applyExplicitLogTextFilter(tx, "logs.token_name", tokenName); err != nil {
return nil, 0, err
if tokenName != "" {
tx = tx.Where("logs.token_name = ?", tokenName)
}
if requestId != "" {
tx = tx.Where("logs.request_id = ?", requestId)
......@@ -415,8 +415,8 @@ func GetUserLogs(userId int, logType int, startTimestamp int64, endTimestamp int
if tx, err = applyExplicitLogTextFilter(tx, "logs.model_name", modelName); err != nil {
return nil, 0, err
}
if tx, err = applyExplicitLogTextFilter(tx, "logs.token_name", tokenName); err != nil {
return nil, 0, err
if tokenName != "" {
tx = tx.Where("logs.token_name = ?", tokenName)
}
if requestId != "" {
tx = tx.Where("logs.request_id = ?", requestId)
......@@ -466,11 +466,9 @@ func SumUsedQuota(logType int, startTimestamp int64, endTimestamp int64, modelNa
if rpmTpmQuery, err = applyExplicitLogTextFilter(rpmTpmQuery, "username", username); err != nil {
return stat, err
}
if tx, err = applyExplicitLogTextFilter(tx, "token_name", tokenName); err != nil {
return stat, err
}
if rpmTpmQuery, err = applyExplicitLogTextFilter(rpmTpmQuery, "token_name", tokenName); err != nil {
return stat, err
if tokenName != "" {
tx = tx.Where("token_name = ?", tokenName)
rpmTpmQuery = rpmTpmQuery.Where("token_name = ?", tokenName)
}
if startTimestamp != 0 {
tx = tx.Where("created_at >= ?", startTimestamp)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment