Merge pull request #90 from mxpv/chan

A few minor fixes in SDK

Author: mxpv

machine.go

@@ -200,14 +200,9 @@ func NewMachine(ctx context.Context, cfg Config, opts ...Opt) (*Machine, error)
 	m := &Machine{
 		exitCh: make(chan struct{}),
 	}
-	logger := log.New()
-
-	if cfg.Debug {
-		logger.SetLevel(log.DebugLevel)
-	}
 
 	m.Handlers = defaultHandlers
-	m.logger = log.NewEntry(logger)
+
 	if cfg.EnableJailer {
 		m.Handlers.Validation = m.Handlers.Validation.Append(JailerConfigValidationHandler)
 		if err := jail(ctx, m, &cfg); err != nil {
@@ -224,6 +219,15 @@ func NewMachine(ctx context.Context, cfg Config, opts ...Opt) (*Machine, error)
 		opt(m)
 	}
 
+	if m.logger == nil {
+		logger := log.New()
+		if cfg.Debug {
+			logger.SetLevel(log.DebugLevel)
+		}
+
+		m.logger = log.NewEntry(logger)
+	}
+
 	if m.client == nil {
 		m.client = NewClient(cfg.SocketPath, m.logger, cfg.Debug)
 	}
@@ -332,6 +336,11 @@ func (m *Machine) startVMM(ctx context.Context) error {
 		os.Remove(m.cfg.LogFifo)
 		os.Remove(m.cfg.MetricsFifo)
 		errCh <- err
+
+		// Notify subscribers that there will be no more values.
+		// When err is nil, two reads are performed (waitForSocket and close exitCh goroutine),
+		// second one never ends as it tries to read from empty channel.
+		close(errCh)
 	}()
 
 	// Set up a signal handler and pass INT, QUIT, and TERM through to firecracker

machine_test.go

@@ -373,6 +373,10 @@ func TestStartVMM(t *testing.T) {
 			t.Errorf("startVMM returned %s", m.Wait(ctx))
 		}
 	}
+
+	// Make sure exitCh close
+	_, closed := <-m.exitCh
+	assert.False(t, closed)
 }
 
 func TestStartVMMOnce(t *testing.T) {