Skip to content

Commit 563df78

Browse files
authored
Merge pull request #626 from swagatbora90/main
fix: check logger nil after applying opts
2 parents 03dbe20 + 8a89003 commit 563df78

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

machine.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -384,12 +384,6 @@ func NewMachine(ctx context.Context, cfg Config, opts ...Opt) (*Machine, error)
384384
m.cmd = configureBuilder(defaultFirecrackerVMMCommandBuilder, cfg).Build(ctx)
385385
}
386386

387-
if m.logger == nil {
388-
logger := log.New()
389-
390-
m.logger = log.NewEntry(logger)
391-
}
392-
393387
if m.client == nil {
394388
m.client = NewClient(cfg.SocketPath, m.logger, false)
395389
}
@@ -415,6 +409,12 @@ func NewMachine(ctx context.Context, cfg Config, opts ...Opt) (*Machine, error)
415409
opt(m)
416410
}
417411

412+
if m.logger == nil {
413+
logger := log.New()
414+
415+
m.logger = log.NewEntry(logger)
416+
}
417+
418418
m.logger.Debug("Called NewMachine()")
419419
return m, nil
420420
}

0 commit comments

Comments
 (0)