[FAB-6772] Fix unformatted chaincode log messages

This CR fixes a few unformatted chaincode log messages. Change-Id: I1ea6dd0bccb466a466955d632934d04579f99f37 Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
hyperledger · Oct 26, 2017 · 29e606a · 29e606a
1 parent aa69bc7
commit 29e606a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/core/chaincode/handler.go b/core/chaincode/handler.go
@@ -303,14 +303,15 @@ func (handler *Handler) processStream() error {
 		case in = <-msgAvail:
 			// Defer the deregistering of the this handler.
 			if err == io.EOF {
-				chaincodeLogger.Debugf("Received EOF, ending chaincode support stream: %+v", err)
+				err = errors.Wrapf(err, "received EOF, ending chaincode support stream")
+				chaincodeLogger.Debugf("%+v", err)
 				return err
 			} else if err != nil {
 				chaincodeLogger.Errorf("Error handling chaincode support stream: %+v", err)
 				return err
 			} else if in == nil {
 				err = errors.New("received nil message, ending chaincode support stream")
-				chaincodeLogger.Debug("%+v", err)
+				chaincodeLogger.Debugf("%+v", err)
 				return err
 			}
 			chaincodeLogger.Debugf("[%s]Received message %s from shim", shorttxid(in.Txid), in.Type.String())
@@ -331,7 +332,7 @@ func (handler *Handler) processStream() error {
 			in = nsInfo.msg
 			if in == nil {
 				err = errors.New("next state nil message, ending chaincode support stream")
-				chaincodeLogger.Debug("%+v", err)
+				chaincodeLogger.Debugf("%+v", err)
 				return err
 			}
 			chaincodeLogger.Debugf("[%s]Move state message %s", shorttxid(in.Txid), in.Type.String())

diff --git a/core/chaincode/shim/chaincode.go b/core/chaincode/shim/chaincode.go
@@ -301,14 +301,15 @@ func chatWithPeer(chaincodename string, stream PeerChaincodeStream, cc Chaincode
 				return
 			case in = <-msgAvail:
 				if err == io.EOF {
-					chaincodeLogger.Debugf("Received EOF, ending chaincode stream: %+v", err)
+					err = errors.Wrapf(err, "received EOF, ending chaincode stream")
+					chaincodeLogger.Debugf("%+v", err)
 					return
 				} else if err != nil {
 					chaincodeLogger.Errorf("Received error from server, ending chaincode stream: %+v", err)
 					return
 				} else if in == nil {
 					err = errors.New("received nil message, ending chaincode stream")
-					chaincodeLogger.Debug("%+v", err)
+					chaincodeLogger.Debugf("%+v", err)
 					return
 				}
 				chaincodeLogger.Debugf("[%s]Received message %s from shim", shorttxid(in.Txid), in.Type.String())