Skip to content

Commit 8751c97

Browse files
authored
chore: remove unnecessary level filter (#6392)
* chore: remove unnecessary level filter Signed-off-by: Ben Ye <[email protected]> * remove unused code Signed-off-by: Ben Ye <[email protected]> --------- Signed-off-by: Ben Ye <[email protected]>
1 parent bc1b5be commit 8751c97

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

pkg/util/log/log.go

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func newPrometheusLoggerFrom(logger log.Logger, logLevel logging.Level, keyvals
8585
// Ref: https://github.com/go-kit/log/issues/14#issuecomment-945038252
8686
logger = log.With(logger, "ts", log.DefaultTimestampUTC)
8787
logger = log.With(logger, keyvals...)
88-
logger = level.NewFilter(logger, LevelFilter(logLevel.String()))
88+
logger = level.NewFilter(logger, logLevel.Gokit)
8989

9090
// Initialise counters for all supported levels:
9191
for _, level := range supportedLevels {
@@ -123,24 +123,6 @@ func CheckFatal(location string, err error) {
123123
}
124124
}
125125

126-
// TODO(dannyk): remove once weaveworks/common updates to go-kit/log
127-
//
128-
// -> we can then revert to using Level.Gokit
129-
func LevelFilter(l string) level.Option {
130-
switch l {
131-
case "debug":
132-
return level.AllowDebug()
133-
case "info":
134-
return level.AllowInfo()
135-
case "warn":
136-
return level.AllowWarn()
137-
case "error":
138-
return level.AllowError()
139-
default:
140-
return level.AllowAll()
141-
}
142-
}
143-
144126
func HeaderMapFromContext(ctx context.Context) map[string]string {
145127
headerMap, ok := ctx.Value(headerMapContextKey).(map[string]string)
146128
if !ok {

0 commit comments

Comments
 (0)