调整整体架构写法
调整db用法 调整日志用法 调整模版
This commit is contained in:
1 parent
734a48dbb8
commit
e2952fa393
137 files changed
+3638
-3544
No files matched your search
+32
-5
@@ -1,15 +1,19 @@
|
||||
package logger
|
||||
|
||||
import (
|
||||
"io"
|
||||
"os"
|
||||
|
||||
"github.com/go-admin-team/go-admin-core/debug/writer"
|
||||
"github.com/go-admin-team/go-admin-core/logger"
|
||||
"github.com/go-admin-team/go-admin-core/plugins/logger/zap"
|
||||
|
||||
"go-admin/common/log"
|
||||
log "github.com/go-admin-team/go-admin-core/logger"
|
||||
"go-admin/tools"
|
||||
)
|
||||
|
||||
// SetupLogger 日志
|
||||
func SetupLogger(path string, prefix string) logger.Logger {
|
||||
func SetupLogger(logType, path, levelStr, outputType string) logger.Logger {
|
||||
var setLogger logger.Logger
|
||||
if !tools.PathExist(path) {
|
||||
err := tools.PathCreate(path)
|
||||
@@ -17,10 +21,33 @@ func SetupLogger(path string, prefix string) logger.Logger {
|
||||
log.Fatalf("create dir error: %s", err.Error())
|
||||
}
|
||||
}
|
||||
output, err := writer.NewFileWriter(path, "log")
|
||||
var err error
|
||||
var output io.Writer
|
||||
switch outputType {
|
||||
case "file":
|
||||
output, err = writer.NewFileWriter(path, "log")
|
||||
if err != nil {
|
||||
log.Fatal("logger setup error: %s", err.Error())
|
||||
}
|
||||
default:
|
||||
output = os.Stdout
|
||||
}
|
||||
var level logger.Level
|
||||
level, err = logger.GetLevel(levelStr)
|
||||
if err != nil {
|
||||
log.Fatal("%s logger setup error: %s", prefix, err.Error())
|
||||
log.Fatalf("get logger level error, %s", err.Error())
|
||||
}
|
||||
|
||||
switch logType {
|
||||
case "zap":
|
||||
setLogger, err = zap.NewLogger(logger.WithLevel(level), logger.WithOutput(output), zap.WithCallerSkip(2))
|
||||
if err != nil {
|
||||
log.Fatalf("new zap logger error, %s", err.Error())
|
||||
}
|
||||
//case "logrus":
|
||||
// setLogger = logrus.NewLogger(logger.WithLevel(level), logger.WithOutput(output), logrus.ReportCaller())
|
||||
default:
|
||||
setLogger = logger.NewLogger(logger.WithLevel(level), logger.WithOutput(output))
|
||||
}
|
||||
setLogger = logger.NewHelper(logger.NewLogger(logger.WithOutput(output), logger.WithName(prefix)))
|
||||
return setLogger
|
||||
}
|
||||
Reference in new issue
Block a user