Skip to content

Commit a7620f2

Browse files
committed
error handling
1 parent 9ffe423 commit a7620f2

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

v2/connection/connection_http_internal.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -317,20 +317,23 @@ func (j *httpConnection) bodyReadFunc(decoder Decoder, req *httpRequest, stream
317317
return nil, err
318318
}
319319

320-
var encErr error
321320
if compressedWriter != nil {
322321
defer func(compressedWriter io.WriteCloser) {
323322
errCompression := compressedWriter.Close()
324323
if errCompression != nil {
325-
log.Errorf(errCompression, "error closing compressed writer")
324+
log.Error(errCompression, "error closing compressed writer")
325+
if err == nil {
326+
err = errCompression
327+
}
326328
}
327329
}(compressedWriter)
328-
encErr = decoder.Encode(compressedWriter, req.body)
330+
331+
err = decoder.Encode(compressedWriter, req.body)
329332
} else {
330-
encErr = decoder.Encode(b, req.body)
333+
err = decoder.Encode(b, req.body)
331334
}
332335

333-
if encErr != nil {
336+
if err != nil {
334337
log.Errorf(err, "error encoding body - OBJ: %v", req.body)
335338
return nil, err
336339
}
@@ -355,6 +358,7 @@ func (j *httpConnection) bodyReadFunc(decoder Decoder, req *httpRequest, stream
355358
errCompression := compressedWriter.Close()
356359
if errCompression != nil {
357360
log.Errorf(errCompression, "error closing compressed writer - stream")
361+
writer.CloseWithError(err)
358362
}
359363
}(compressedWriter)
360364
encErr = decoder.Encode(compressedWriter, req.body)

0 commit comments

Comments
 (0)