Merge pull request #258 from kzys/log-empty-level

Setting a logger without its level

Author: kzys

machine.go

@@ -618,9 +618,16 @@ func (m *Machine) setupLogging(ctx context.Context) error {
 		return nil
 	}
 
+	// m.Cfg.LogLevel cannot be nil, but Firecracker allows setting a logger
+	// without its level. Converting "" to nil to support the corner case.
+	level := String(m.Cfg.LogLevel)
+	if StringValue(level) == "" {
+		level = nil
+	}
+
 	l := models.Logger{
 		LogPath:       String(path),
-		Level:         String(m.Cfg.LogLevel),
+		Level:         level,
 		ShowLevel:     Bool(true),
 		ShowLogOrigin: Bool(false),
 	}

machine_test.go

@@ -423,6 +423,7 @@ func TestLogAndMetrics(t *testing.T) {
 		logLevel string
 		quiet    bool
 	}{
+		{logLevel: "", quiet: false},
 		{logLevel: "Info", quiet: false},
 		{logLevel: "Error", quiet: true},
 	}
@@ -431,9 +432,15 @@ func TestLogAndMetrics(t *testing.T) {
 			out := testLogAndMetrics(t, test.logLevel)
 			if test.quiet {
 				assert.Regexp(t, `^Running Firecracker v0\.\d+\.0`, out)
-			} else {
-				assert.Contains(t, string(out), ":"+strings.ToUpper(test.logLevel)+"]")
+				return
 			}
+
+			// By default, Firecracker's log level is Warn.
+			logLevel := "WARN"
+			if test.logLevel != "" {
+				logLevel = strings.ToUpper(test.logLevel)
+			}
+			assert.Contains(t, out, ":"+logLevel+"]")
 		})
 	}
 }