-
Notifications
You must be signed in to change notification settings - Fork 611
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
implement dual logging for nerdctl run in foreground
Signed-off-by: Vishwas Siravara <siravara@amazon.com>
- Loading branch information
Showing
9 changed files
with
580 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| //go:build windows | ||
|
|
||
| /* | ||
| Copyright The containerd Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package cioutil | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io" | ||
| "os/exec" | ||
|
|
||
| "github.com/Microsoft/go-winio" | ||
| "github.com/containerd/containerd/cio" | ||
| "github.com/containerd/log" | ||
| ) | ||
|
|
||
| // copyIO is from https://github.com/containerd/containerd/blob/148d21b1ae0718b75718a09ecb307bb874270f59/cio/io_windows.go#L44 | ||
| func copyIO(_ *exec.Cmd, fifos *cio.FIFOSet, ioset *cio.Streams) (_ *ncio, retErr error) { | ||
| ncios := &ncio{cmd: nil, config: fifos.Config} | ||
|
|
||
| defer func() { | ||
| if retErr != nil { | ||
| _ = ncios.Close() | ||
| } | ||
| }() | ||
|
|
||
| if fifos.Stdin != "" { | ||
| l, err := winio.ListenPipe(fifos.Stdin, nil) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to create stdin pipe %s: %w", fifos.Stdin, err) | ||
| } | ||
| ncios.closers = append(ncios.closers, l) | ||
|
|
||
| go func() { | ||
| c, err := l.Accept() | ||
| if err != nil { | ||
| log.L.WithError(err).Errorf("failed to accept stdin connection on %s", fifos.Stdin) | ||
| return | ||
| } | ||
|
|
||
| p := bufPool.Get().(*[]byte) | ||
| defer bufPool.Put(p) | ||
|
|
||
| io.CopyBuffer(c, ioset.Stdin, *p) | ||
| c.Close() | ||
| l.Close() | ||
| }() | ||
| } | ||
|
|
||
| if fifos.Stdout != "" { | ||
| l, err := winio.ListenPipe(fifos.Stdout, nil) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to create stdout pipe %s: %w", fifos.Stdout, err) | ||
| } | ||
| ncios.closers = append(ncios.closers, l) | ||
|
|
||
| go func() { | ||
| c, err := l.Accept() | ||
| if err != nil { | ||
| log.L.WithError(err).Errorf("failed to accept stdout connection on %s", fifos.Stdout) | ||
| return | ||
| } | ||
|
|
||
| p := bufPool.Get().(*[]byte) | ||
| defer bufPool.Put(p) | ||
|
|
||
| io.CopyBuffer(ioset.Stdout, c, *p) | ||
| c.Close() | ||
| l.Close() | ||
| }() | ||
| } | ||
|
|
||
| if fifos.Stderr != "" { | ||
| l, err := winio.ListenPipe(fifos.Stderr, nil) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to create stderr pipe %s: %w", fifos.Stderr, err) | ||
| } | ||
| ncios.closers = append(ncios.closers, l) | ||
|
|
||
| go func() { | ||
| c, err := l.Accept() | ||
| if err != nil { | ||
| log.L.WithError(err).Errorf("failed to accept stderr connection on %s", fifos.Stderr) | ||
| return | ||
| } | ||
|
|
||
| p := bufPool.Get().(*[]byte) | ||
| defer bufPool.Put(p) | ||
|
|
||
| io.CopyBuffer(ioset.Stderr, c, *p) | ||
| c.Close() | ||
| l.Close() | ||
| }() | ||
| } | ||
|
|
||
| return ncios, nil | ||
| } |
Oops, something went wrong.