github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-10 04:18:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3784 from liubin/fix/3783-use-exec-pipe

Browse Source 
runtime: use Cmd.StdoutPipe instead of self-created pipe
This commit is contained in:
Fabiano Fidêncio 2022-02-28 18:04:58 +01:00 committed by GitHub
commit 21a8ba93c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/runtime/virtcontainers/nydusd.go
View File

@ -104,12 +104,13 @@ func (nd *nydusd) Start(ctx context.Context, onQuit onQuitFunc) (int, error) {
return pid, err return pid, err
} }
cmd := exec.Command(nd.path, args...) cmd := exec.Command(nd.path, args...)
r, w, err := os.Pipe() stdout, err := cmd.StdoutPipe()
if err != nil { if err != nil {
return pid, err return pid, err
} }
cmd.Stdout = w
cmd.Stderr = w cmd.Stderr = cmd.Stdout
fields := logrus.Fields{ fields := logrus.Fields{
"path": nd.path, "path": nd.path,
"args": strings.Join(args, " "), "args": strings.Join(args, " "),
@ -120,7 +121,7 @@ func (nd *nydusd) Start(ctx context.Context, onQuit onQuitFunc) (int, error) {
} }
// Monitor nydusd's stdout/stderr and stop sandbox if nydusd quits // Monitor nydusd's stdout/stderr and stop sandbox if nydusd quits
go func() { go func() {
scanner := bufio.NewScanner(r) scanner := bufio.NewScanner(stdout)
for scanner.Scan() { for scanner.Scan() {
nd.Logger().Info(scanner.Text()) nd.Logger().Info(scanner.Text())
} }