Skip to content

new idea #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions v2/slogger/appender.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,25 @@ func (self *FilterAppender) Flush() error {
return self.Appender.Flush()
}

func LevelFilter(threshold Level, appender Appender) *FilterAppender {
type LevelFilterAppender struct {
level Level
FilterAppender
}

func (self *LevelFilterAppender) AllowsLevel(level Level) bool {
return level >= self.level
}

func LevelFilter(threshold Level, appender Appender) Appender {
filterFunc := func(log *Log) bool {
return log.Level >= threshold
}

return &FilterAppender{
Appender: appender,
Filter: filterFunc,
return &LevelFilterAppender{
threshold,
FilterAppender{
Appender: appender,
Filter: filterFunc,
},
}
}
24 changes: 24 additions & 0 deletions v2/slogger/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,10 @@ func (self *Logger) logf(level Level, errorCode ErrorCode, messageFmt string, co
}
}

if !self.AllowsLevel(level) {
return nil, errors
}

pc, file, line, ok := nonSloggerCaller()
if ok == false {
return nil, []error{fmt.Errorf("Failed to find the calling method.")}
Expand Down Expand Up @@ -276,6 +280,26 @@ func (self *Logger) logf(level Level, errorCode ErrorCode, messageFmt string, co
return log, errors
}

type LevelTester interface {
AllowsLevel(Level) bool
}

func (self *Logger) AllowsLevel(level Level) bool {
for _, appender := range self.Appenders {
if levelTester, ok := appender.(LevelTester); ok {
if levelTester.AllowsLevel(level) {
return true
}
} else {
// only takes one unknown filter to have to make the assumption that
// we allow this level
return true
}
}
// if we got to here then we know none of them allow the level
return false
}

type Level uint8

// The level is in an order such that the expressions
Expand Down