dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-13 17:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48435 from thaJeztah/stream_errorsjoin

Browse Source 
container/stream: Config.CloseStreams(): use errors.Join
This commit is contained in:
Albin Kerouanton
2024-09-09 21:48:32 +02:00
committed by GitHub
parent 5c96ed4109 928e5aa524
commit 0d91e80dbb
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
container/stream/streams.go
View File

@@ -5,7 +5,6 @@ import (
"errors"
"fmt"
"io"
"strings"
"sync"
"github.com/containerd/containerd/cio"
@@ -92,27 +91,23 @@ func (c *Config) NewNopInputPipe() {
// CloseStreams ensures that the configured streams are properly closed.
func (c *Config) CloseStreams() error {
var errs []string
var errs error
if c.stdin != nil {
if err := c.stdin.Close(); err != nil {
errs = append(errs, fmt.Sprintf("error close stdin: %s", err))
errs = errors.Join(errs, fmt.Errorf("error close stdin: %w", err))
}
}
if err := c.stdout.Clean(); err != nil {
errs = append(errs, fmt.Sprintf("error close stdout: %s", err))
errs = errors.Join(errs, fmt.Errorf("error close stdout: %w", err))
}
if err := c.stderr.Clean(); err != nil {
errs = append(errs, fmt.Sprintf("error close stderr: %s", err))
errs = errors.Join(errs, fmt.Errorf("error close stderr: %w", err))
}
if len(errs) > 0 {
return errors.New(strings.Join(errs, "\n"))
}
return nil
return errs
}
// CopyToPipe connects streamconfig with a libcontainerd.IOPipe