Skip to content

Commit 0f43cb0

Browse files
committed
defer writer errors and move them to the right place
1 parent 307f4c3 commit 0f43cb0

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

cmd/pgbackrest/main.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,18 @@ func (k *KubeAPI) Exec(ctx context.Context, namespace, pod, container string, st
133133
exec, err := remotecommand.NewSPDYExecutor(k.Config, "POST", request.URL())
134134

135135
stdoutReader, stdoutWriter := io.Pipe()
136+
defer func() {
137+
if err := stdoutWriter.Close(); err != nil {
138+
log.Errorf("error closing stdoutWriter: %v", err)
139+
}
140+
}()
141+
136142
stderrReader, stderrWriter := io.Pipe()
143+
defer func() {
144+
if err := stderrWriter.Close(); err != nil {
145+
log.Errorf("error closing stderrWriter: %v", err)
146+
}
147+
}()
137148

138149
go streamUsingPrefix("[pgbackrest:stdout]", stdoutReader)
139150
go streamUsingPrefix("[pgbackrest:stderr]", stderrReader)
@@ -144,17 +155,6 @@ func (k *KubeAPI) Exec(ctx context.Context, namespace, pod, container string, st
144155
Stderr: stderrWriter,
145156
})
146157

147-
err = stdoutWriter.Close()
148-
if err != nil {
149-
log.Error(err)
150-
return err
151-
}
152-
err = stderrWriter.Close()
153-
if err != nil {
154-
log.Error(err)
155-
return err
156-
}
157-
158158
return err
159159
}
160160

0 commit comments

Comments
 (0)