mirror of
https://github.com/containers/podman.git
synced 2025-06-21 09:28:09 +08:00
Merge pull request #10243 from giuseppe/simplify-channel
channel: simplify implementation
This commit is contained in:
@ -1,7 +1,6 @@
|
|||||||
package channel
|
package channel
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"io"
|
"io"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
@ -34,20 +33,17 @@ func (w *writeCloser) Chan() <-chan []byte {
|
|||||||
|
|
||||||
// Write method for WriteCloser
|
// Write method for WriteCloser
|
||||||
func (w *writeCloser) Write(b []byte) (bLen int, err error) {
|
func (w *writeCloser) Write(b []byte) (bLen int, err error) {
|
||||||
// https://github.com/containers/podman/issues/7896
|
if w == nil {
|
||||||
// when podman-remote pull image, if it was killed, the server will panic: send on closed channel
|
|
||||||
// so handle it
|
|
||||||
defer func() {
|
|
||||||
if rErr := recover(); rErr != nil {
|
|
||||||
err = fmt.Errorf("%s", rErr)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
if w == nil || w.ch == nil {
|
|
||||||
return 0, errors.New("use channel.NewWriter() to initialize a WriteCloser")
|
return 0, errors.New("use channel.NewWriter() to initialize a WriteCloser")
|
||||||
}
|
}
|
||||||
|
|
||||||
w.mux.Lock()
|
w.mux.Lock()
|
||||||
defer w.mux.Unlock()
|
defer w.mux.Unlock()
|
||||||
|
|
||||||
|
if w.ch == nil {
|
||||||
|
return 0, errors.New("the channel is closed for Write")
|
||||||
|
}
|
||||||
|
|
||||||
buf := make([]byte, len(b))
|
buf := make([]byte, len(b))
|
||||||
copy(buf, b)
|
copy(buf, b)
|
||||||
w.ch <- buf
|
w.ch <- buf
|
||||||
@ -57,6 +53,10 @@ func (w *writeCloser) Write(b []byte) (bLen int, err error) {
|
|||||||
|
|
||||||
// Close method for WriteCloser
|
// Close method for WriteCloser
|
||||||
func (w *writeCloser) Close() error {
|
func (w *writeCloser) Close() error {
|
||||||
|
w.mux.Lock()
|
||||||
|
defer w.mux.Unlock()
|
||||||
|
|
||||||
close(w.ch)
|
close(w.ch)
|
||||||
|
w.ch = nil
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user