File tree Expand file tree Collapse file tree 2 files changed +17
-3
lines changed Expand file tree Collapse file tree 2 files changed +17
-3
lines changed Original file line number Diff line number Diff line change @@ -616,9 +616,16 @@ func (m *Machine) setupLogging(ctx context.Context) error {
616
616
return nil
617
617
}
618
618
619
+ // m.Cfg.LogLevel cannot be nil, but Firecracker allows setting a logger
620
+ // without its level. Converting "" to nil to support the corner case.
621
+ level := String (m .Cfg .LogLevel )
622
+ if StringValue (level ) == "" {
623
+ level = nil
624
+ }
625
+
619
626
l := models.Logger {
620
627
LogPath : String (path ),
621
- Level : String ( m . Cfg . LogLevel ) ,
628
+ Level : level ,
622
629
ShowLevel : Bool (true ),
623
630
ShowLogOrigin : Bool (false ),
624
631
}
Original file line number Diff line number Diff line change @@ -424,6 +424,7 @@ func TestLogAndMetrics(t *testing.T) {
424
424
logLevel string
425
425
quiet bool
426
426
}{
427
+ {logLevel : "" , quiet : false },
427
428
{logLevel : "Info" , quiet : false },
428
429
{logLevel : "Error" , quiet : true },
429
430
}
@@ -432,9 +433,15 @@ func TestLogAndMetrics(t *testing.T) {
432
433
out := testLogAndMetrics (t , test .logLevel )
433
434
if test .quiet {
434
435
assert .Regexp (t , `^Running Firecracker v0\.\d+\.0` , out )
435
- } else {
436
- assert .Contains (t , string (out ), ":" + strings .ToUpper (test .logLevel )+ "]" )
436
+ return
437
437
}
438
+
439
+ // By default, Firecracker's log level is Warn.
440
+ logLevel := "WARN"
441
+ if test .logLevel != "" {
442
+ logLevel = strings .ToUpper (test .logLevel )
443
+ }
444
+ assert .Contains (t , out , ":" + logLevel + "]" )
438
445
})
439
446
}
440
447
}
You can’t perform that action at this time.
0 commit comments