Update log.go

bitset loglevel
This commit is contained in:
W192547975
2023-08-06 16:30:55 +08:00
committed by GitHub
parent 0af65b7204
commit e39cf4eea5

View File

@@ -36,9 +36,8 @@ func init() {
}
const (
LogFile = iota
LogFile = 1 << iota
LogConsole
LogFileAndConsole
)
type logger struct {
@@ -50,11 +49,11 @@ type logger struct {
lineEnding string
pid int
maxLogSize int64
mode int
mode int16
stdLogger *log.Logger
}
func NewLogger(path string, filePrefix string, level LogLevel, maxLogSize int64, mode int) *logger {
func NewLogger(path string, filePrefix string, level LogLevel, maxLogSize int64, mode int16) *logger {
loggers := make(map[LogLevel]*log.Logger)
logfiles := make(map[LogLevel]*os.File)
var (
@@ -140,10 +139,10 @@ func (l *logger) Printf(level LogLevel, format string, params ...interface{}) {
}
pidAndLevel := []interface{}{l.pid, loglevel[level]}
params = append(pidAndLevel, params...)
if l.mode == LogFile || l.mode == LogFileAndConsole {
if l.mode & LogFile != 0 {
l.loggers[0].Printf("%d %s "+format+l.lineEnding, params...)
}
if l.mode == LogConsole || l.mode == LogFileAndConsole {
if l.mode & LogConsole != 0 {
l.stdLogger.Printf("%d %s "+format+l.lineEnding, params...)
}
}
@@ -157,10 +156,10 @@ func (l *logger) Println(level LogLevel, params ...interface{}) {
pidAndLevel := []interface{}{l.pid, " ", loglevel[level], " "}
params = append(pidAndLevel, params...)
params = append(params, l.lineEnding)
if l.mode == LogFile || l.mode == LogFileAndConsole {
if l.mode & LogFile != 0 {
l.loggers[0].Print(params...)
}
if l.mode == LogConsole || l.mode == LogFileAndConsole {
if l.mode & LogConsole != 0 {
l.stdLogger.Print(params...)
}
}