From 7f4f3f0e943e3ced49f17bd13eb8cbbb6f3fdb4c Mon Sep 17 00:00:00 2001 From: radekg Date: Fri, 14 Jan 2022 09:14:37 +0100 Subject: [PATCH] Fix error processing in single node client --- client/single_node_client.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/client/single_node_client.go b/client/single_node_client.go index 6e73524..f658ed9 100644 --- a/client/single_node_client.go +++ b/client/single_node_client.go @@ -220,9 +220,9 @@ func (c *defaultSingleNodeClient) readResponseInto(reader *bytes.Buffer, m proto responseHeader := &ybApi.ResponseHeader{} protoErr := utils.DeserializeProto(responseHeaderBuf, responseHeader) if protoErr != nil { - opLogger.Error("failed unmarshalling response header", "reason", err) + opLogger.Error("failed unmarshalling response header", "reason", protoErr) return &errors.ReceiveError{ - Cause: fmt.Errorf("response header unprocessable: %s", err.Error()), + Cause: fmt.Errorf("response header unprocessable: %s", protoErr.Error()), } } @@ -271,12 +271,13 @@ func (c *defaultSingleNodeClient) readResponseInto(reader *bytes.Buffer, m proto for { buf, err := c.recv() if err != nil { - opLogger.Error("response payload read bytes count != expected count", + opLogger.Error("response payload read error", "expected-payload-length", responsePayloadLength, - "read-payload-length", n) + "read-payload-length", n, + "reason", err) return &errors.ReceiveError{ - Cause: fmt.Errorf("response payload incomplete: read %d bytes vs expected %d", - n, responsePayloadLength), + Cause: fmt.Errorf("response payload read error: read %d bytes vs expected %d, reason: %s", + n, responsePayloadLength, err.Error()), } }