fix logger bug

This commit is contained in:
2025-10-04 17:42:26 +08:00
parent 464617626b
commit 5584757ff4
4 changed files with 50 additions and 30 deletions

View File

@@ -13,11 +13,12 @@ import (
"git.apinb.com/bsm-sdk/core/conf"
"git.apinb.com/bsm-sdk/core/utils"
"git.apinb.com/bsm-sdk/core/vars"
)
// Logger 日志器结构
type Logger struct {
level conf.LogLevel
level vars.LogLevel
infoLogger *log.Logger
warnLogger *log.Logger
errorLogger *log.Logger
@@ -69,7 +70,7 @@ func NewLogger(cfg *conf.LogConf) (*Logger, error) {
multiWriter := io.MultiWriter(consoleWriter, fileWriter)
logger := &Logger{
level: conf.LogLevel(cfg.Level),
level: vars.LogLevel(cfg.Level),
fileWriter: fileWriter,
consoleWriter: consoleWriter,
logDir: cfg.Dir,
@@ -152,7 +153,7 @@ func (l *Logger) sendToRemote(level, name, out string) {
// Debug 输出调试信息
func (l *Logger) Debug(v ...interface{}) {
if l.level <= conf.DEBUG {
if l.level <= vars.DEBUG {
l.checkAndRotateLog()
out := fmt.Sprint(v...)
if l.onRemote {
@@ -164,7 +165,7 @@ func (l *Logger) Debug(v ...interface{}) {
// Debugf 格式化输出调试信息
func (l *Logger) Debugf(format string, v ...interface{}) {
if l.level <= conf.DEBUG {
if l.level <= vars.DEBUG {
l.checkAndRotateLog()
out := fmt.Sprintf(format, v...)
if l.onRemote {
@@ -176,7 +177,7 @@ func (l *Logger) Debugf(format string, v ...interface{}) {
// Info 输出信息
func (l *Logger) Info(v ...interface{}) {
if l.level <= conf.INFO {
if l.level <= vars.INFO {
l.checkAndRotateLog()
out := fmt.Sprint(v...)
if l.onRemote {
@@ -188,7 +189,7 @@ func (l *Logger) Info(v ...interface{}) {
// Infof 格式化输出信息
func (l *Logger) Infof(format string, v ...interface{}) {
if l.level <= conf.INFO {
if l.level <= vars.INFO {
l.checkAndRotateLog()
out := fmt.Sprintf(format, v...)
if l.onRemote {
@@ -200,7 +201,7 @@ func (l *Logger) Infof(format string, v ...interface{}) {
// Warn 输出警告
func (l *Logger) Warn(v ...interface{}) {
if l.level <= conf.WARN {
if l.level <= vars.WARN {
l.checkAndRotateLog()
out := fmt.Sprint(v...)
if l.onRemote {
@@ -212,7 +213,7 @@ func (l *Logger) Warn(v ...interface{}) {
// Warnf 格式化输出警告
func (l *Logger) Warnf(format string, v ...interface{}) {
if l.level <= conf.WARN {
if l.level <= vars.WARN {
l.checkAndRotateLog()
out := fmt.Sprintf(format, v...)
if l.onRemote {
@@ -224,7 +225,7 @@ func (l *Logger) Warnf(format string, v ...interface{}) {
// Error 输出错误
func (l *Logger) Error(v ...interface{}) {
if l.level <= conf.ERROR {
if l.level <= vars.ERROR {
l.checkAndRotateLog()
out := fmt.Sprint(v...)
if l.onRemote {
@@ -236,7 +237,7 @@ func (l *Logger) Error(v ...interface{}) {
// Errorf 格式化输出错误
func (l *Logger) Errorf(format string, v ...interface{}) {
if l.level <= conf.ERROR {
if l.level <= vars.ERROR {
l.checkAndRotateLog()
out := fmt.Sprintf(format, v...)
if l.onRemote {
@@ -284,14 +285,14 @@ func (l *Logger) Println(v ...interface{}) {
}
// SetLevel 设置日志级别
func (l *Logger) SetLevel(level conf.LogLevel) {
func (l *Logger) SetLevel(level vars.LogLevel) {
l.mu.Lock()
defer l.mu.Unlock()
l.level = level
}
// GetLevel 获取日志级别
func (l *Logger) GetLevel() conf.LogLevel {
func (l *Logger) GetLevel() vars.LogLevel {
l.mu.RLock()
defer l.mu.RUnlock()
return l.level