refactor: centralize logging and update resource initialization

This commit refactors the logging mechanism across the application by replacing direct logger calls with a centralized logging approach using the `common` package. Key changes include:

- Replaced instances of `logger.SysLog` and `logger.FatalLog` with `common.SysLog` and `common.FatalLog` for consistent logging practices.
- Updated resource initialization error handling to utilize the new logging structure, enhancing maintainability and readability.
- Minor adjustments to improve code clarity and organization throughout various modules.

This change aims to streamline logging and improve the overall architecture of the codebase.
This commit is contained in:
CaIon
2025-08-14 21:10:04 +08:00
parent e2037ad756
commit 6748b006b7
101 changed files with 537 additions and 568 deletions

View File

@@ -2,7 +2,7 @@ package setting
import (
"encoding/json"
"one-api/logger"
"one-api/common"
)
var Chats = []map[string]string{
@@ -37,7 +37,7 @@ func UpdateChatsByJsonString(jsonString string) error {
func Chats2JsonString() string {
jsonBytes, err := json.Marshal(Chats)
if err != nil {
logger.SysError("error marshalling chats: " + err.Error())
common.SysLog("error marshalling chats: " + err.Error())
return "[]"
}
return string(jsonBytes)

View File

@@ -2,7 +2,7 @@ package config
import (
"encoding/json"
"one-api/logger"
"one-api/common"
"reflect"
"strconv"
"strings"
@@ -57,7 +57,7 @@ func (cm *ConfigManager) LoadFromDB(options map[string]string) error {
// 如果找到配置项,则更新配置
if len(configMap) > 0 {
if err := updateConfigFromMap(config, configMap); err != nil {
logger.SysError("failed to update config " + name + ": " + err.Error())
common.SysError("failed to update config " + name + ": " + err.Error())
continue
}
}

View File

@@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"
"math"
"one-api/logger"
"one-api/common"
"sync"
)
@@ -21,7 +21,7 @@ func ModelRequestRateLimitGroup2JSONString() string {
jsonBytes, err := json.Marshal(ModelRequestRateLimitGroup)
if err != nil {
logger.SysError("error marshalling model ratio: " + err.Error())
common.SysLog("error marshalling model ratio: " + err.Error())
}
return string(jsonBytes)
}

View File

@@ -2,7 +2,7 @@ package ratio_setting
import (
"encoding/json"
"one-api/logger"
"one-api/common"
"sync"
)
@@ -89,7 +89,7 @@ func CacheRatio2JSONString() string {
defer cacheRatioMapMutex.RUnlock()
jsonBytes, err := json.Marshal(cacheRatioMap)
if err != nil {
logger.SysError("error marshalling cache ratio: " + err.Error())
common.SysLog("error marshalling cache ratio: " + err.Error())
}
return string(jsonBytes)
}

View File

@@ -3,7 +3,7 @@ package ratio_setting
import (
"encoding/json"
"errors"
"one-api/logger"
"one-api/common"
"sync"
)
@@ -48,7 +48,7 @@ func GroupRatio2JSONString() string {
jsonBytes, err := json.Marshal(groupRatio)
if err != nil {
logger.SysError("error marshalling model ratio: " + err.Error())
common.SysLog("error marshalling model ratio: " + err.Error())
}
return string(jsonBytes)
}
@@ -67,7 +67,7 @@ func GetGroupRatio(name string) float64 {
ratio, ok := groupRatio[name]
if !ok {
logger.SysError("group ratio not found: " + name)
common.SysLog("group ratio not found: " + name)
return 1
}
return ratio
@@ -94,7 +94,7 @@ func GroupGroupRatio2JSONString() string {
jsonBytes, err := json.Marshal(GroupGroupRatio)
if err != nil {
logger.SysError("error marshalling group-group ratio: " + err.Error())
common.SysLog("error marshalling group-group ratio: " + err.Error())
}
return string(jsonBytes)
}

View File

@@ -2,7 +2,7 @@ package setting
import (
"encoding/json"
"one-api/logger"
"one-api/common"
"sync"
)
@@ -29,7 +29,7 @@ func UserUsableGroups2JSONString() string {
jsonBytes, err := json.Marshal(userUsableGroups)
if err != nil {
logger.SysError("error marshalling user groups: " + err.Error())
common.SysLog("error marshalling user groups: " + err.Error())
}
return string(jsonBytes)
}