Merge pull request #626 from swagatbora90/main

fix: check logger nil after applying opts
firecracker-microvm · Feb 11, 2025 · 563df78 · 563df78
2 parents 03dbe20 + 8a89003
commit 563df78
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/machine.go b/machine.go
@@ -384,12 +384,6 @@ func NewMachine(ctx context.Context, cfg Config, opts ...Opt) (*Machine, error)
 		m.cmd = configureBuilder(defaultFirecrackerVMMCommandBuilder, cfg).Build(ctx)
 	}
 
-	if m.logger == nil {
-		logger := log.New()
-
-		m.logger = log.NewEntry(logger)
-	}
-
 	if m.client == nil {
 		m.client = NewClient(cfg.SocketPath, m.logger, false)
 	}
@@ -415,6 +409,12 @@ func NewMachine(ctx context.Context, cfg Config, opts ...Opt) (*Machine, error)
 		opt(m)
 	}
 
+	if m.logger == nil {
+		logger := log.New()
+
+		m.logger = log.NewEntry(logger)
+	}
+
 	m.logger.Debug("Called NewMachine()")
 	return m, nil
 }