Skip to content

Commit 3b19fd1

Browse files
authored
Merge pull request #198 from MaggieNgWu/release-2.7.0
fix bug of print message conteent
2 parents 8d21e88 + 3b869d8 commit 3b19fd1

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/AmopImp.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,18 @@ public void sendAmopMsg(AmopMsgOut content, AmopResponseCallback callback) {
115115
new ResponseCallback() {
116116
@Override
117117
public void onResponse(Response response) {
118+
logger.trace(
119+
"receive response from subscriber, seq:{}",
120+
response.getMessageID());
118121
AmopResponse amopResponse = new AmopResponse(response);
119122
callback.onResponse(amopResponse);
120123
}
121124
};
122125
this.channel.asyncSendToRandom(msg, cb, ops);
123126
logger.info(
124-
"send amop msg to a random peer, seq{} topic{}", msg.getSeq(), content.getTopic());
127+
"send amop msg to a random peer, seq: {} topic: {}",
128+
msg.getSeq(),
129+
content.getTopic());
125130
}
126131

127132
@Override

sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelImp.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,10 @@ public void run(Timeout timeout) {
327327
@Override
328328
public void asyncSendToRandom(Message out, ResponseCallback callback, Options options) {
329329
List<String> peerList = getAvailablePeer();
330+
if (peerList.size() == 0) {
331+
logger.warn(
332+
"no available peer to send to, seq: {}, type: {}", out.getSeq(), out.getType());
333+
}
330334
int random = (int) (Math.random() * (peerList.size()));
331335
String peerIpPort = peerList.get(random);
332336
logger.trace("send message to random peer {} ", peerIpPort);

sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelMsgHandler.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ public void onMessage(ChannelHandlerContext ctx, Message msg) {
129129
if (callback != null) {
130130
callback.cancelTimeout();
131131
logger.trace(
132-
" receive response, seq: {}, result: {}, content: {}",
132+
" call registered callback, seq: {}, type: {} ,result: {}",
133133
msg.getSeq(),
134-
msg.getResult(),
135-
new String(msg.getData()));
134+
msg.getType(),
135+
msg.getResult());
136136

137137
Response response = new Response();
138138
if (msg.getResult() != 0) {
@@ -145,10 +145,10 @@ public void onMessage(ChannelHandlerContext ctx, Message msg) {
145145
callback.onResponse(response);
146146
} else {
147147
logger.trace(
148-
" receive response with invalid seq, type: {}, result: {}, content: {}",
148+
" receive message, no callback, try call handler, seq:{} , type: {}, result: {}",
149+
msg.getSeq(),
149150
(int) msg.getType(),
150-
msg.getResult(),
151-
new String(msg.getData()));
151+
msg.getResult());
152152
MsgHandler msgHandler = msgHandlers.get(msg.getType().intValue());
153153
if (msgHandler != null) {
154154
msgHandler.onMessage(ctx, msg);

0 commit comments

Comments
 (0)