tools/out-of-tree
1
0
Fork 0
Code Releases Activity

Revert "Ensure log file is available for VM status check"

Browse Source 
This reverts commit 8c1024b36c.
This commit is contained in:
dump_stack() 2023-05-07 16:03:28 +00:00
parent 8c1024b36c
commit 734240500b
Signed by: dump_stack
GPG Key ID: BE44DA8C062D87DC
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pew.go
View File

@ -564,7 +564,7 @@ func (cmd PewCmd) testArtifact(swg *sizedwaitgroup.SizedWaitGroup,
log.Error().Err(err).Msgf("create %s", logfile) log.Error().Err(err).Msgf("create %s", logfile)
return return
} }
// Make sure the file is closed on each return before !q.Died logging defer f.Close()
slog := zerolog.New(zerolog.MultiLevelWriter( slog := zerolog.New(zerolog.MultiLevelWriter(
&consoleWriter, &consoleWriter,
@ -597,7 +597,6 @@ func (cmd PewCmd) testArtifact(swg *sizedwaitgroup.SizedWaitGroup,
q, err := qemu.NewSystem(qemu.X86x64, kernel, ki.RootFS) q, err := qemu.NewSystem(qemu.X86x64, kernel, ki.RootFS)
if err != nil { if err != nil {
slog.Error().Err(err).Msg("qemu init") slog.Error().Err(err).Msg("qemu init")
f.Close()
return return
} }
q.Log = slog q.Log = slog
@ -626,7 +625,6 @@ func (cmd PewCmd) testArtifact(swg *sizedwaitgroup.SizedWaitGroup,
err = q.Start() err = q.Start()
if err != nil { if err != nil {
slog.Error().Err(err).Msg("qemu start") slog.Error().Err(err).Msg("qemu start")
f.Close()
return return
} }
defer q.Stop() defer q.Stop()
@ -636,7 +634,6 @@ func (cmd PewCmd) testArtifact(swg *sizedwaitgroup.SizedWaitGroup,
time.Sleep(time.Minute) time.Sleep(time.Minute)
slog.Debug().Msg("still alive") slog.Debug().Msg("still alive")
} }
f.Close()
}() }()
tmp, err := ioutil.TempDir(tempDirBase, "out-of-tree_") tmp, err := ioutil.TempDir(tempDirBase, "out-of-tree_")