Skip to content

Commit 1648cd6

Browse files
committed
Don't create logger instance if WithLogger opt used
Signed-off-by: Maksym Pavlenko <[email protected]>
1 parent b704cc3 commit 1648cd6

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

machine.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,9 @@ func NewMachine(ctx context.Context, cfg Config, opts ...Opt) (*Machine, error)
200200
m := &Machine{
201201
exitCh: make(chan struct{}),
202202
}
203-
logger := log.New()
204-
205-
if cfg.Debug {
206-
logger.SetLevel(log.DebugLevel)
207-
}
208203

209204
m.Handlers = defaultHandlers
210-
m.logger = log.NewEntry(logger)
205+
211206
if cfg.EnableJailer {
212207
m.Handlers.Validation = m.Handlers.Validation.Append(JailerConfigValidationHandler)
213208
if err := jail(ctx, m, &cfg); err != nil {
@@ -224,6 +219,15 @@ func NewMachine(ctx context.Context, cfg Config, opts ...Opt) (*Machine, error)
224219
opt(m)
225220
}
226221

222+
if m.logger == nil {
223+
logger := log.New()
224+
if cfg.Debug {
225+
logger.SetLevel(log.DebugLevel)
226+
}
227+
228+
m.logger = log.NewEntry(logger)
229+
}
230+
227231
if m.client == nil {
228232
m.client = NewClient(cfg.SocketPath, m.logger, cfg.Debug)
229233
}

0 commit comments

Comments
 (0)