日志全部改为go-admin-core库日志,去除对其他项目的依赖

This commit is contained in:
linwenxiang committed 2020-10-29 19:22:23 +08:00
1 parent 706c72b973
commit ccd76445f2
13 files changed
+161 -150

No files matched your search

+67 -29
View File
@@ -1,35 +1,73 @@
package logger
import (
"github.com/gogf/gf/os/glog"
"go-admin/tools"
"go-admin/tools/config"
"github.com/go-admin-team/go-admin-core/logger"
"os"
)
func Setup() (*glog.Logger, *glog.Logger, *glog.Logger) {
var Logger *glog.Logger
var JobLogger *glog.Logger
var RequestLogger *glog.Logger
Logger = glog.New()
_ = Logger.SetPath(config.LoggerConfig.Path + "/bus")
Logger.SetStdoutPrint(config.LoggerConfig.EnabledBUS && config.LoggerConfig.Stdout)
Logger.SetFile("bus-{Ymd}.log")
_ = Logger.SetLevelStr(config.LoggerConfig.Level)
JobLogger = glog.New()
_ = JobLogger.SetPath(config.LoggerConfig.Path + "/job")
JobLogger.SetStdoutPrint(false)
JobLogger.SetFile("db-{Ymd}.log")
_ = JobLogger.SetLevelStr(config.LoggerConfig.Level)
RequestLogger = glog.New()
_ = RequestLogger.SetPath(config.LoggerConfig.Path + "/request")
RequestLogger.SetStdoutPrint(false)
RequestLogger.SetFile("access-{Ymd}.log")
_ = RequestLogger.SetLevelStr(config.LoggerConfig.Level)
Logger.Info(tools.Green("Logger init success!"))
return Logger, JobLogger, RequestLogger
// Logger 通用log个性化实现
type Logger struct {
logger.Logger
}
// Info info级日志输出
func (l *Logger) Info(args ...interface{}) {
l.Log(logger.InfoLevel, args...)
}
// Infof info级日志输出
func (l *Logger) Infof(template string, args ...interface{}) {
l.Logf(logger.InfoLevel, template, args...)
}
// Trace trace级日志输出
func (l *Logger) Trace(args ...interface{}) {
l.Log(logger.InfoLevel, args...)
}
// Tracef trace级日志输出
func (l *Logger) Tracef(template string, args ...interface{}) {
l.Logf(logger.InfoLevel, template, args...)
}
// Debug debug级日志输出
func (l *Logger) Debug(args ...interface{}) {
l.Log(logger.InfoLevel, args...)
}
// Debugf debug级日志输出
func (l *Logger) Debugf(template string, args ...interface{}) {
l.Logf(logger.InfoLevel, template, args...)
}
// Warn warn级日志输出
func (l *Logger) Warn(args ...interface{}) {
l.Log(logger.InfoLevel, args...)
}
// Warnf warn级日志输出
func (l *Logger) Warnf(template string, args ...interface{}) {
l.Logf(logger.InfoLevel, template, args...)
}
// Error error级日志输出
func (l *Logger) Error(args ...interface{}) {
l.Log(logger.InfoLevel, args...)
}
// Errorf error级日志输出
func (l *Logger) Errorf(template string, args ...interface{}) {
l.Logf(logger.InfoLevel, template, args...)
}
// Fatal fatal级日志输出
func (l *Logger) Fatal(args ...interface{}) {
l.Log(logger.InfoLevel, args...)
os.Exit(1)
}
// Fatalf fatal级日志输出
func (l *Logger) Fatalf(template string, args ...interface{}) {
l.Logf(logger.InfoLevel, template, args...)
os.Exit(1)
}
+48
View File
@@ -0,0 +1,48 @@
package logger
import (
"path/filepath"
"github.com/go-admin-team/go-admin-core/debug/writer"
"github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/log"
)
//func Setup() (*glog.Logger, *glog.Logger) {
// var Logger *glog.Logger
// var JobLogger *glog.Logger
// var RequestLogger *glog.Logger
//
// Logger = glog.New()
// _ = Logger.SetPath(config.LoggerConfig.Path + "/bus")
// Logger.SetStdoutPrint(config.LoggerConfig.EnabledBUS && config.LoggerConfig.Stdout)
// Logger.SetFile("bus-{Ymd}.log")
// _ = Logger.SetLevelStr(config.LoggerConfig.Level)
//
// JobLogger = glog.New()
// _ = JobLogger.SetPath(config.LoggerConfig.Path + "/job")
// JobLogger.SetStdoutPrint(false)
// JobLogger.SetFile("db-{Ymd}.log")
// _ = JobLogger.SetLevelStr(config.LoggerConfig.Level)
//
// RequestLogger = glog.New()
// _ = RequestLogger.SetPath(config.LoggerConfig.Path + "/request")
// RequestLogger.SetStdoutPrint(false)
// RequestLogger.SetFile("access-{Ymd}.log")
// _ = RequestLogger.SetLevelStr(config.LoggerConfig.Level)
//
// Logger.Info(tools.Green("Logger init success!"))
// return Logger, JobLogger
//}
// SetupLogger 日志
func SetupLogger(path string, subPath string) logger.Logger {
var setLogger logger.Logger
output, err := writer.NewFileWriter(filepath.Join(path, subPath), "log")
if err != nil {
log.Fatal("request logger setup error: %s", err.Error)
}
setLogger = logger.NewHelper(logger.NewLogger(logger.WithOutput(output)))
return setLogger
}