mirror of https://github.com/sirupsen/logrus.git
feat(LogLevel): taking in account code review from David Bariod
This commit is contained in:
parent
0ab534bf6c
commit
90bf2e7f39
60
entry.go
60
entry.go
|
@ -151,7 +151,7 @@ func (entry *Entry) write() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Debug(args ...interface{}) {
|
func (entry *Entry) Debug(args ...interface{}) {
|
||||||
if entry.IsDebugEnabled() {
|
if entry.Logger.IsLevelEnabled(DebugLevel) {
|
||||||
entry.log(DebugLevel, fmt.Sprint(args...))
|
entry.log(DebugLevel, fmt.Sprint(args...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -161,13 +161,13 @@ func (entry *Entry) Print(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Info(args ...interface{}) {
|
func (entry *Entry) Info(args ...interface{}) {
|
||||||
if entry.IsInfoEnabled() {
|
if entry.Logger.IsLevelEnabled(InfoLevel) {
|
||||||
entry.log(InfoLevel, fmt.Sprint(args...))
|
entry.log(InfoLevel, fmt.Sprint(args...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Warn(args ...interface{}) {
|
func (entry *Entry) Warn(args ...interface{}) {
|
||||||
if entry.IsWarnEnabled() {
|
if entry.Logger.IsLevelEnabled(WarnLevel) {
|
||||||
entry.log(WarnLevel, fmt.Sprint(args...))
|
entry.log(WarnLevel, fmt.Sprint(args...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -177,20 +177,20 @@ func (entry *Entry) Warning(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Error(args ...interface{}) {
|
func (entry *Entry) Error(args ...interface{}) {
|
||||||
if entry.IsErrorEnabled() {
|
if entry.Logger.IsLevelEnabled(ErrorLevel) {
|
||||||
entry.log(ErrorLevel, fmt.Sprint(args...))
|
entry.log(ErrorLevel, fmt.Sprint(args...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Fatal(args ...interface{}) {
|
func (entry *Entry) Fatal(args ...interface{}) {
|
||||||
if entry.IsFatalEnabled() {
|
if entry.Logger.IsLevelEnabled(FatalLevel) {
|
||||||
entry.log(FatalLevel, fmt.Sprint(args...))
|
entry.log(FatalLevel, fmt.Sprint(args...))
|
||||||
}
|
}
|
||||||
Exit(1)
|
Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Panic(args ...interface{}) {
|
func (entry *Entry) Panic(args ...interface{}) {
|
||||||
if entry.IsPanicEnabled() {
|
if entry.Logger.IsLevelEnabled(PanicLevel) {
|
||||||
entry.log(PanicLevel, fmt.Sprint(args...))
|
entry.log(PanicLevel, fmt.Sprint(args...))
|
||||||
}
|
}
|
||||||
panic(fmt.Sprint(args...))
|
panic(fmt.Sprint(args...))
|
||||||
|
@ -199,13 +199,13 @@ func (entry *Entry) Panic(args ...interface{}) {
|
||||||
// Entry Printf family functions
|
// Entry Printf family functions
|
||||||
|
|
||||||
func (entry *Entry) Debugf(format string, args ...interface{}) {
|
func (entry *Entry) Debugf(format string, args ...interface{}) {
|
||||||
if entry.IsDebugEnabled() {
|
if entry.Logger.IsLevelEnabled(DebugLevel) {
|
||||||
entry.Debug(fmt.Sprintf(format, args...))
|
entry.Debug(fmt.Sprintf(format, args...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Infof(format string, args ...interface{}) {
|
func (entry *Entry) Infof(format string, args ...interface{}) {
|
||||||
if entry.IsInfoEnabled() {
|
if entry.Logger.IsLevelEnabled(InfoLevel) {
|
||||||
entry.Info(fmt.Sprintf(format, args...))
|
entry.Info(fmt.Sprintf(format, args...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -215,7 +215,7 @@ func (entry *Entry) Printf(format string, args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Warnf(format string, args ...interface{}) {
|
func (entry *Entry) Warnf(format string, args ...interface{}) {
|
||||||
if entry.IsWarnEnabled() {
|
if entry.Logger.IsLevelEnabled(WarnLevel) {
|
||||||
entry.Warn(fmt.Sprintf(format, args...))
|
entry.Warn(fmt.Sprintf(format, args...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -225,20 +225,20 @@ func (entry *Entry) Warningf(format string, args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Errorf(format string, args ...interface{}) {
|
func (entry *Entry) Errorf(format string, args ...interface{}) {
|
||||||
if entry.IsErrorEnabled() {
|
if entry.Logger.IsLevelEnabled(ErrorLevel) {
|
||||||
entry.Error(fmt.Sprintf(format, args...))
|
entry.Error(fmt.Sprintf(format, args...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Fatalf(format string, args ...interface{}) {
|
func (entry *Entry) Fatalf(format string, args ...interface{}) {
|
||||||
if entry.IsFatalEnabled() {
|
if entry.Logger.IsLevelEnabled(FatalLevel) {
|
||||||
entry.Fatal(fmt.Sprintf(format, args...))
|
entry.Fatal(fmt.Sprintf(format, args...))
|
||||||
}
|
}
|
||||||
Exit(1)
|
Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Panicf(format string, args ...interface{}) {
|
func (entry *Entry) Panicf(format string, args ...interface{}) {
|
||||||
if entry.IsPanicEnabled() {
|
if entry.Logger.IsLevelEnabled(PanicLevel) {
|
||||||
entry.Panic(fmt.Sprintf(format, args...))
|
entry.Panic(fmt.Sprintf(format, args...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -246,13 +246,13 @@ func (entry *Entry) Panicf(format string, args ...interface{}) {
|
||||||
// Entry Println family functions
|
// Entry Println family functions
|
||||||
|
|
||||||
func (entry *Entry) Debugln(args ...interface{}) {
|
func (entry *Entry) Debugln(args ...interface{}) {
|
||||||
if entry.IsDebugEnabled() {
|
if entry.Logger.IsLevelEnabled(DebugLevel) {
|
||||||
entry.Debug(entry.sprintlnn(args...))
|
entry.Debug(entry.sprintlnn(args...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Infoln(args ...interface{}) {
|
func (entry *Entry) Infoln(args ...interface{}) {
|
||||||
if entry.IsInfoEnabled() {
|
if entry.Logger.IsLevelEnabled(InfoLevel) {
|
||||||
entry.Info(entry.sprintlnn(args...))
|
entry.Info(entry.sprintlnn(args...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -262,7 +262,7 @@ func (entry *Entry) Println(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Warnln(args ...interface{}) {
|
func (entry *Entry) Warnln(args ...interface{}) {
|
||||||
if entry.IsWarnEnabled() {
|
if entry.Logger.IsLevelEnabled(WarnLevel) {
|
||||||
entry.Warn(entry.sprintlnn(args...))
|
entry.Warn(entry.sprintlnn(args...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -272,48 +272,24 @@ func (entry *Entry) Warningln(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Errorln(args ...interface{}) {
|
func (entry *Entry) Errorln(args ...interface{}) {
|
||||||
if entry.IsErrorEnabled() {
|
if entry.Logger.IsLevelEnabled(ErrorLevel) {
|
||||||
entry.Error(entry.sprintlnn(args...))
|
entry.Error(entry.sprintlnn(args...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Fatalln(args ...interface{}) {
|
func (entry *Entry) Fatalln(args ...interface{}) {
|
||||||
if entry.IsFatalEnabled() {
|
if entry.Logger.IsLevelEnabled(FatalLevel) {
|
||||||
entry.Fatal(entry.sprintlnn(args...))
|
entry.Fatal(entry.sprintlnn(args...))
|
||||||
}
|
}
|
||||||
Exit(1)
|
Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) Panicln(args ...interface{}) {
|
func (entry *Entry) Panicln(args ...interface{}) {
|
||||||
if entry.IsPanicEnabled() {
|
if entry.Logger.IsLevelEnabled(PanicLevel) {
|
||||||
entry.Panic(entry.sprintlnn(args...))
|
entry.Panic(entry.sprintlnn(args...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (entry *Entry) IsDebugEnabled() bool {
|
|
||||||
return entry.Logger.IsDebugEnabled()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (entry *Entry) IsInfoEnabled() bool {
|
|
||||||
return entry.Logger.IsInfoEnabled()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (entry *Entry) IsWarnEnabled() bool {
|
|
||||||
return entry.Logger.IsWarnEnabled()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (entry *Entry) IsErrorEnabled() bool {
|
|
||||||
return entry.Logger.IsErrorEnabled()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (entry *Entry) IsFatalEnabled() bool {
|
|
||||||
return entry.Logger.IsFatalEnabled()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (entry *Entry) IsPanicEnabled() bool {
|
|
||||||
return entry.Logger.IsPanicEnabled()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sprintlnn => Sprint no newline. This is to get the behavior of how
|
// Sprintlnn => Sprint no newline. This is to get the behavior of how
|
||||||
// fmt.Sprintln where spaces are always added between operands, regardless of
|
// fmt.Sprintln where spaces are always added between operands, regardless of
|
||||||
// their type. Instead of vendoring the Sprintln implementation to spare a
|
// their type. Instead of vendoring the Sprintln implementation to spare a
|
||||||
|
|
25
exported.go
25
exported.go
|
@ -34,28 +34,9 @@ func GetLevel() Level {
|
||||||
return std.GetLevel()
|
return std.GetLevel()
|
||||||
}
|
}
|
||||||
|
|
||||||
func IsDebugEnabled() bool {
|
// IsLevelEnabled checks if the log level of the standard logger is greater than the level param
|
||||||
return std.IsDebugEnabled()
|
func IsLevelEnabled(level Level) bool {
|
||||||
}
|
return std.IsLevelEnabled(level)
|
||||||
|
|
||||||
func IsInfoEnabled() bool {
|
|
||||||
return std.IsInfoEnabled()
|
|
||||||
}
|
|
||||||
|
|
||||||
func IsWarnEnabled() bool {
|
|
||||||
return std.IsWarnEnabled()
|
|
||||||
}
|
|
||||||
|
|
||||||
func IsErrorEnabled() bool {
|
|
||||||
return std.IsErrorEnabled()
|
|
||||||
}
|
|
||||||
|
|
||||||
func IsFatalEnabled() bool {
|
|
||||||
return std.IsFatalEnabled()
|
|
||||||
}
|
|
||||||
|
|
||||||
func IsPanicEnabled() bool {
|
|
||||||
return std.IsPanicEnabled()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddHook adds a hook to the standard logger hooks.
|
// AddHook adds a hook to the standard logger hooks.
|
||||||
|
|
65
logger.go
65
logger.go
|
@ -122,7 +122,7 @@ func (logger *Logger) WithTime(t time.Time) *Entry {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Debugf(format string, args ...interface{}) {
|
func (logger *Logger) Debugf(format string, args ...interface{}) {
|
||||||
if logger.IsDebugEnabled() {
|
if logger.IsLevelEnabled(DebugLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Debugf(format, args...)
|
entry.Debugf(format, args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -130,7 +130,7 @@ func (logger *Logger) Debugf(format string, args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Infof(format string, args ...interface{}) {
|
func (logger *Logger) Infof(format string, args ...interface{}) {
|
||||||
if logger.IsInfoEnabled() {
|
if logger.IsLevelEnabled(InfoLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Infof(format, args...)
|
entry.Infof(format, args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -144,7 +144,7 @@ func (logger *Logger) Printf(format string, args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Warnf(format string, args ...interface{}) {
|
func (logger *Logger) Warnf(format string, args ...interface{}) {
|
||||||
if logger.IsWarnEnabled() {
|
if logger.IsLevelEnabled(WarnLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Warnf(format, args...)
|
entry.Warnf(format, args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -152,7 +152,7 @@ func (logger *Logger) Warnf(format string, args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Warningf(format string, args ...interface{}) {
|
func (logger *Logger) Warningf(format string, args ...interface{}) {
|
||||||
if logger.IsWarnEnabled() {
|
if logger.IsLevelEnabled(WarnLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Warnf(format, args...)
|
entry.Warnf(format, args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -160,7 +160,7 @@ func (logger *Logger) Warningf(format string, args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Errorf(format string, args ...interface{}) {
|
func (logger *Logger) Errorf(format string, args ...interface{}) {
|
||||||
if logger.IsErrorEnabled() {
|
if logger.IsLevelEnabled(ErrorLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Errorf(format, args...)
|
entry.Errorf(format, args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -168,7 +168,7 @@ func (logger *Logger) Errorf(format string, args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Fatalf(format string, args ...interface{}) {
|
func (logger *Logger) Fatalf(format string, args ...interface{}) {
|
||||||
if logger.IsFatalEnabled() {
|
if logger.IsLevelEnabled(FatalLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Fatalf(format, args...)
|
entry.Fatalf(format, args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -177,7 +177,7 @@ func (logger *Logger) Fatalf(format string, args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Panicf(format string, args ...interface{}) {
|
func (logger *Logger) Panicf(format string, args ...interface{}) {
|
||||||
if logger.IsPanicEnabled() {
|
if logger.IsLevelEnabled(PanicLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Panicf(format, args...)
|
entry.Panicf(format, args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -185,7 +185,7 @@ func (logger *Logger) Panicf(format string, args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Debug(args ...interface{}) {
|
func (logger *Logger) Debug(args ...interface{}) {
|
||||||
if logger.IsDebugEnabled() {
|
if logger.IsLevelEnabled(DebugLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Debug(args...)
|
entry.Debug(args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -193,7 +193,7 @@ func (logger *Logger) Debug(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Info(args ...interface{}) {
|
func (logger *Logger) Info(args ...interface{}) {
|
||||||
if logger.IsInfoEnabled() {
|
if logger.IsLevelEnabled(InfoLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Info(args...)
|
entry.Info(args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -207,7 +207,7 @@ func (logger *Logger) Print(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Warn(args ...interface{}) {
|
func (logger *Logger) Warn(args ...interface{}) {
|
||||||
if logger.IsWarnEnabled() {
|
if logger.IsLevelEnabled(WarnLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Warn(args...)
|
entry.Warn(args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -215,7 +215,7 @@ func (logger *Logger) Warn(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Warning(args ...interface{}) {
|
func (logger *Logger) Warning(args ...interface{}) {
|
||||||
if logger.IsWarnEnabled() {
|
if logger.IsLevelEnabled(WarnLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Warn(args...)
|
entry.Warn(args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -223,7 +223,7 @@ func (logger *Logger) Warning(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Error(args ...interface{}) {
|
func (logger *Logger) Error(args ...interface{}) {
|
||||||
if logger.IsErrorEnabled() {
|
if logger.IsLevelEnabled(ErrorLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Error(args...)
|
entry.Error(args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -231,7 +231,7 @@ func (logger *Logger) Error(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Fatal(args ...interface{}) {
|
func (logger *Logger) Fatal(args ...interface{}) {
|
||||||
if logger.IsFatalEnabled() {
|
if logger.IsLevelEnabled(FatalLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Fatal(args...)
|
entry.Fatal(args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -240,7 +240,7 @@ func (logger *Logger) Fatal(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Panic(args ...interface{}) {
|
func (logger *Logger) Panic(args ...interface{}) {
|
||||||
if logger.IsPanicEnabled() {
|
if logger.IsLevelEnabled(PanicLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Panic(args...)
|
entry.Panic(args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -248,7 +248,7 @@ func (logger *Logger) Panic(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Debugln(args ...interface{}) {
|
func (logger *Logger) Debugln(args ...interface{}) {
|
||||||
if logger.IsDebugEnabled() {
|
if logger.IsLevelEnabled(DebugLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Debugln(args...)
|
entry.Debugln(args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -256,7 +256,7 @@ func (logger *Logger) Debugln(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Infoln(args ...interface{}) {
|
func (logger *Logger) Infoln(args ...interface{}) {
|
||||||
if logger.IsInfoEnabled() {
|
if logger.IsLevelEnabled(InfoLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Infoln(args...)
|
entry.Infoln(args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -270,7 +270,7 @@ func (logger *Logger) Println(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Warnln(args ...interface{}) {
|
func (logger *Logger) Warnln(args ...interface{}) {
|
||||||
if logger.IsWarnEnabled() {
|
if logger.IsLevelEnabled(WarnLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Warnln(args...)
|
entry.Warnln(args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -278,7 +278,7 @@ func (logger *Logger) Warnln(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Warningln(args ...interface{}) {
|
func (logger *Logger) Warningln(args ...interface{}) {
|
||||||
if logger.IsWarnEnabled() {
|
if logger.IsLevelEnabled(WarnLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Warnln(args...)
|
entry.Warnln(args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -286,7 +286,7 @@ func (logger *Logger) Warningln(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Errorln(args ...interface{}) {
|
func (logger *Logger) Errorln(args ...interface{}) {
|
||||||
if logger.IsErrorEnabled() {
|
if logger.IsLevelEnabled(ErrorLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Errorln(args...)
|
entry.Errorln(args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -294,7 +294,7 @@ func (logger *Logger) Errorln(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Fatalln(args ...interface{}) {
|
func (logger *Logger) Fatalln(args ...interface{}) {
|
||||||
if logger.IsFatalEnabled() {
|
if logger.IsLevelEnabled(FatalLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Fatalln(args...)
|
entry.Fatalln(args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -303,7 +303,7 @@ func (logger *Logger) Fatalln(args ...interface{}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) Panicln(args ...interface{}) {
|
func (logger *Logger) Panicln(args ...interface{}) {
|
||||||
if logger.IsPanicEnabled() {
|
if logger.IsLevelEnabled(PanicLevel) {
|
||||||
entry := logger.newEntry()
|
entry := logger.newEntry()
|
||||||
entry.Panicln(args...)
|
entry.Panicln(args...)
|
||||||
logger.releaseEntry(entry)
|
logger.releaseEntry(entry)
|
||||||
|
@ -338,28 +338,11 @@ func (logger *Logger) AddHook(hook Hook) {
|
||||||
logger.Hooks.Add(hook)
|
logger.Hooks.Add(hook)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) IsDebugEnabled() bool {
|
// IsLevelEnabled checks if the log level of the logger is greater than the level param
|
||||||
return logger.level() >= DebugLevel
|
func (logger *Logger) IsLevelEnabled(level Level) bool {
|
||||||
|
return logger.level() >= level
|
||||||
}
|
}
|
||||||
|
|
||||||
func (logger *Logger) IsInfoEnabled() bool {
|
|
||||||
return logger.level() >= InfoLevel
|
|
||||||
}
|
|
||||||
|
|
||||||
func (logger *Logger) IsWarnEnabled() bool {
|
|
||||||
return logger.level() >= WarnLevel
|
|
||||||
}
|
|
||||||
|
|
||||||
func (logger *Logger) IsErrorEnabled() bool {
|
|
||||||
return logger.level() >= ErrorLevel
|
|
||||||
}
|
|
||||||
|
|
||||||
func (logger *Logger) IsFatalEnabled() bool {
|
|
||||||
return logger.level() >= FatalLevel
|
|
||||||
}
|
|
||||||
|
|
||||||
func (logger *Logger) IsPanicEnabled() bool {
|
|
||||||
return logger.level() >= PanicLevel
|
|
||||||
// SetFormatter sets the logger formatter.
|
// SetFormatter sets the logger formatter.
|
||||||
func (logger *Logger) SetFormatter(formatter Formatter) {
|
func (logger *Logger) SetFormatter(formatter Formatter) {
|
||||||
logger.mu.Lock()
|
logger.mu.Lock()
|
||||||
|
|
12
logrus.go
12
logrus.go
|
@ -141,10 +141,10 @@ type FieldLogger interface {
|
||||||
Fatalln(args ...interface{})
|
Fatalln(args ...interface{})
|
||||||
Panicln(args ...interface{})
|
Panicln(args ...interface{})
|
||||||
|
|
||||||
IsDebugEnabled() bool
|
// IsDebugEnabled() bool
|
||||||
IsInfoEnabled() bool
|
// IsInfoEnabled() bool
|
||||||
IsWarnEnabled() bool
|
// IsWarnEnabled() bool
|
||||||
IsErrorEnabled() bool
|
// IsErrorEnabled() bool
|
||||||
IsFatalEnabled() bool
|
// IsFatalEnabled() bool
|
||||||
IsPanicEnabled() bool
|
// IsPanicEnabled() bool
|
||||||
}
|
}
|
||||||
|
|
|
@ -488,50 +488,50 @@ func TestEntryWriter(t *testing.T) {
|
||||||
func TestLogLevelEnabled(t *testing.T) {
|
func TestLogLevelEnabled(t *testing.T) {
|
||||||
log := New()
|
log := New()
|
||||||
log.SetLevel(PanicLevel)
|
log.SetLevel(PanicLevel)
|
||||||
assert.Equal(t, true, log.IsPanicEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
|
||||||
assert.Equal(t, false, log.IsFatalEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(FatalLevel))
|
||||||
assert.Equal(t, false, log.IsErrorEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(ErrorLevel))
|
||||||
assert.Equal(t, false, log.IsWarnEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(WarnLevel))
|
||||||
assert.Equal(t, false, log.IsInfoEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(InfoLevel))
|
||||||
assert.Equal(t, false, log.IsDebugEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
|
||||||
|
|
||||||
log.SetLevel(FatalLevel)
|
log.SetLevel(FatalLevel)
|
||||||
assert.Equal(t, true, log.IsPanicEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
|
||||||
assert.Equal(t, true, log.IsFatalEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
|
||||||
assert.Equal(t, false, log.IsErrorEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(ErrorLevel))
|
||||||
assert.Equal(t, false, log.IsWarnEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(WarnLevel))
|
||||||
assert.Equal(t, false, log.IsInfoEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(InfoLevel))
|
||||||
assert.Equal(t, false, log.IsDebugEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
|
||||||
|
|
||||||
log.SetLevel(ErrorLevel)
|
log.SetLevel(ErrorLevel)
|
||||||
assert.Equal(t, true, log.IsPanicEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
|
||||||
assert.Equal(t, true, log.IsFatalEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
|
||||||
assert.Equal(t, true, log.IsErrorEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(ErrorLevel))
|
||||||
assert.Equal(t, false, log.IsWarnEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(WarnLevel))
|
||||||
assert.Equal(t, false, log.IsInfoEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(InfoLevel))
|
||||||
assert.Equal(t, false, log.IsDebugEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
|
||||||
|
|
||||||
log.SetLevel(WarnLevel)
|
log.SetLevel(WarnLevel)
|
||||||
assert.Equal(t, true, log.IsPanicEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
|
||||||
assert.Equal(t, true, log.IsFatalEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
|
||||||
assert.Equal(t, true, log.IsErrorEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(ErrorLevel))
|
||||||
assert.Equal(t, true, log.IsWarnEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(WarnLevel))
|
||||||
assert.Equal(t, false, log.IsInfoEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(InfoLevel))
|
||||||
assert.Equal(t, false, log.IsDebugEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
|
||||||
|
|
||||||
log.SetLevel(InfoLevel)
|
log.SetLevel(InfoLevel)
|
||||||
assert.Equal(t, true, log.IsPanicEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
|
||||||
assert.Equal(t, true, log.IsFatalEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
|
||||||
assert.Equal(t, true, log.IsErrorEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(ErrorLevel))
|
||||||
assert.Equal(t, true, log.IsWarnEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(WarnLevel))
|
||||||
assert.Equal(t, true, log.IsInfoEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(InfoLevel))
|
||||||
assert.Equal(t, false, log.IsDebugEnabled())
|
assert.Equal(t, false, log.IsLevelEnabled(DebugLevel))
|
||||||
|
|
||||||
log.SetLevel(DebugLevel)
|
log.SetLevel(DebugLevel)
|
||||||
assert.Equal(t, true, log.IsPanicEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(PanicLevel))
|
||||||
assert.Equal(t, true, log.IsFatalEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(FatalLevel))
|
||||||
assert.Equal(t, true, log.IsErrorEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(ErrorLevel))
|
||||||
assert.Equal(t, true, log.IsWarnEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(WarnLevel))
|
||||||
assert.Equal(t, true, log.IsInfoEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(InfoLevel))
|
||||||
assert.Equal(t, true, log.IsDebugEnabled())
|
assert.Equal(t, true, log.IsLevelEnabled(DebugLevel))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue