Skip to content

Commit 2f1eb81

Browse files
authored
Merge pull request #906 from djzager/zapleveltype
⚠️ log/zap options Level and StacktraceLevel type
2 parents 8d8953d + 9233ae6 commit 2f1eb81

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

pkg/log/zap/flags.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func newConsoleEncoder() zapcore.Encoder {
8181
}
8282

8383
type levelFlag struct {
84-
setFunc func(zap.AtomicLevel)
84+
setFunc func(zapcore.LevelEnabler)
8585
value string
8686
}
8787

@@ -115,7 +115,7 @@ func (ev *levelFlag) Type() string {
115115
}
116116

117117
type stackTraceFlag struct {
118-
setFunc func(zap.AtomicLevel)
118+
setFunc func(zapcore.LevelEnabler)
119119
value string
120120
}
121121

pkg/log/zap/zap.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func Encoder(encoder zapcore.Encoder) func(o *Options) {
100100

101101
// Level sets the the minimum enabled logging level e.g Debug, Info
102102
// See Options.Level
103-
func Level(level *zap.AtomicLevel) func(o *Options) {
103+
func Level(level zapcore.LevelEnabler) func(o *Options) {
104104
return func(o *Options) {
105105
o.Level = level
106106
}
@@ -109,7 +109,7 @@ func Level(level *zap.AtomicLevel) func(o *Options) {
109109
// StacktraceLevel configures the logger to record a stack trace for all messages at
110110
// or above a given level.
111111
// See Options.StacktraceLevel
112-
func StacktraceLevel(stacktraceLevel *zap.AtomicLevel) func(o *Options) {
112+
func StacktraceLevel(stacktraceLevel zapcore.LevelEnabler) func(o *Options) {
113113
return func(o *Options) {
114114
o.StacktraceLevel = stacktraceLevel
115115
}
@@ -137,11 +137,11 @@ type Options struct {
137137
DestWritter io.Writer
138138
// Level configures the verbosity of the logging. Defaults to Debug when
139139
// Development is true and Info otherwise
140-
Level *zap.AtomicLevel
140+
Level zapcore.LevelEnabler
141141
// StacktraceLevel is the level at and above which stacktraces will
142142
// be recorded for all messages. Defaults to Warn when Development
143143
// is true and Error otherwise
144-
StacktraceLevel *zap.AtomicLevel
144+
StacktraceLevel zapcore.LevelEnabler
145145
// ZapOpts allows passing arbitrary zap.Options to configure on the
146146
// underlying Zap logger.
147147
ZapOpts []zap.Option
@@ -204,7 +204,7 @@ func NewRaw(opts ...Opts) *zap.Logger {
204204
sink := zapcore.AddSync(o.DestWritter)
205205

206206
o.ZapOpts = append(o.ZapOpts, zap.AddCallerSkip(1), zap.ErrorOutput(sink))
207-
log := zap.New(zapcore.NewCore(&KubeAwareEncoder{Encoder: o.Encoder, Verbose: o.Development}, sink, *o.Level))
207+
log := zap.New(zapcore.NewCore(&KubeAwareEncoder{Encoder: o.Encoder, Verbose: o.Development}, sink, o.Level))
208208
log = log.WithOptions(o.ZapOpts...)
209209
return log
210210
}
@@ -232,17 +232,17 @@ func (o *Options) BindFlags(fs *flag.FlagSet) {
232232

233233
// Set the Log Level
234234
var levelVal levelFlag
235-
levelVal.setFunc = func(fromFlag zap.AtomicLevel) {
236-
o.Level = &fromFlag
235+
levelVal.setFunc = func(fromFlag zapcore.LevelEnabler) {
236+
o.Level = fromFlag
237237
}
238238
fs.Var(&levelVal, "zap-log-level",
239239
"Zap Level to configure the verbosity of logging. Can be one of 'debug', 'info', 'error', "+
240240
"or any integer value > 0 which corresponds to custom debug levels of increasing verbosity")
241241

242242
// Set the StrackTrace Level
243243
var stackVal stackTraceFlag
244-
stackVal.setFunc = func(fromFlag zap.AtomicLevel) {
245-
o.StacktraceLevel = &fromFlag
244+
stackVal.setFunc = func(fromFlag zapcore.LevelEnabler) {
245+
o.StacktraceLevel = fromFlag
246246
}
247247
fs.Var(&stackVal, "zap-stacktrace-level",
248248
"Zap Level at and above which stacktraces are captured (one of 'warn' or 'error')")

0 commit comments

Comments
 (0)