From 3b869d8b835099a42ecc5d3ebb99e8d593ec5c35 Mon Sep 17 00:00:00 2001
From: Maggie WU <maggie@Maggies-MacBook-Pro.local>
Date: Fri, 13 Nov 2020 14:44:44 +0800
Subject: [PATCH] fix bug of print message conteent

---
 .../main/java/org/fisco/bcos/sdk/amop/AmopImp.java   |  7 ++++++-
 .../java/org/fisco/bcos/sdk/channel/ChannelImp.java  |  4 ++++
 .../fisco/bcos/sdk/channel/ChannelMsgHandler.java    | 12 ++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/AmopImp.java b/sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/AmopImp.java
index 74c7420ee..a3a8e3f3b 100644
--- a/sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/AmopImp.java
+++ b/sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/AmopImp.java
@@ -115,13 +115,18 @@ public void sendAmopMsg(AmopMsgOut content, AmopResponseCallback callback) {
                 new ResponseCallback() {
                     @Override
                     public void onResponse(Response response) {
+                        logger.trace(
+                                "receive response from subscriber, seq:{}",
+                                response.getMessageID());
                         AmopResponse amopResponse = new AmopResponse(response);
                         callback.onResponse(amopResponse);
                     }
                 };
         this.channel.asyncSendToRandom(msg, cb, ops);
         logger.info(
-                "send amop msg to a random peer, seq{} topic{}", msg.getSeq(), content.getTopic());
+                "send amop msg to a random peer, seq: {} topic: {}",
+                msg.getSeq(),
+                content.getTopic());
     }
 
     @Override
diff --git a/sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelImp.java b/sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelImp.java
index b09e65161..3756cf79e 100644
--- a/sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelImp.java
+++ b/sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelImp.java
@@ -327,6 +327,10 @@ public void run(Timeout timeout) {
     @Override
     public void asyncSendToRandom(Message out, ResponseCallback callback, Options options) {
         List<String> peerList = getAvailablePeer();
+        if (peerList.size() == 0) {
+            logger.warn(
+                    "no available peer to send to, seq: {}, type: {}", out.getSeq(), out.getType());
+        }
         int random = (int) (Math.random() * (peerList.size()));
         String peerIpPort = peerList.get(random);
         logger.trace("send message to random peer {} ", peerIpPort);
diff --git a/sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelMsgHandler.java b/sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelMsgHandler.java
index 14bc3b843..d876c3cfb 100644
--- a/sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelMsgHandler.java
+++ b/sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelMsgHandler.java
@@ -129,10 +129,10 @@ public void onMessage(ChannelHandlerContext ctx, Message msg) {
         if (callback != null) {
             callback.cancelTimeout();
             logger.trace(
-                    " receive response, seq: {}, result: {}, content: {}",
+                    " call registered callback, seq: {}, type: {} ,result: {}",
                     msg.getSeq(),
-                    msg.getResult(),
-                    new String(msg.getData()));
+                    msg.getType(),
+                    msg.getResult());
 
             Response response = new Response();
             if (msg.getResult() != 0) {
@@ -145,10 +145,10 @@ public void onMessage(ChannelHandlerContext ctx, Message msg) {
             callback.onResponse(response);
         } else {
             logger.trace(
-                    " receive response with invalid seq, type: {}, result: {}, content: {}",
+                    " receive message, no callback, try call handler, seq:{} , type: {}, result: {}",
+                    msg.getSeq(),
                     (int) msg.getType(),
-                    msg.getResult(),
-                    new String(msg.getData()));
+                    msg.getResult());
             MsgHandler msgHandler = msgHandlers.get(msg.getType().intValue());
             if (msgHandler != null) {
                 msgHandler.onMessage(ctx, msg);