Skip to content

return when no peer to send message to #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 20, 2020
Merged

return when no peer to send message to #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
627ecab
return when no peer to send message to
Nov 17, 2020
9eab7d9
remove log down amop content
Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ public void onConnect(ChannelHandlerContext ctx) {

@Override
public void onMessage(ChannelHandlerContext ctx, Message msg) {
logger.trace(
"receive msg, msg type:{}, content:{}", msg.getType(), new String(msg.getData()));
logger.trace("receive msg, msg type:{}, seq:{}", msg.getType(), msg.getSeq());
if (!isRunning) {
logger.warn("Amop on msg, amop is not running, exit.");
}
Expand Down
1 change: 1 addition & 0 deletions sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelImp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ public void asyncSendToRandom(Message out, ResponseCallback callback, Options op
if (peerList.size() == 0) {
logger.warn(
"no available peer to send to, seq: {}, type: {}", out.getSeq(), out.getType());
return;
}
int random = (int) (Math.random() * (peerList.size()));
String peerIpPort = peerList.get(random);
Expand Down
13 changes: 7 additions & 6 deletions sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelMsgHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public void onConnect(ChannelHandlerContext ctx) {

@Override
public void onMessage(ChannelHandlerContext ctx, Message msg) {
logger.trace(
logger.debug(
"onMessage in ChannelMsgHandler called, host : {}, seq : {}, msgType : {}",
ChannelVersionNegotiation.getPeerHost(ctx),
msg.getSeq(),
Expand All @@ -144,15 +144,16 @@ public void onMessage(ChannelHandlerContext ctx, Message msg) {
response.setCtx(ctx);
callback.onResponse(response);
} else {
logger.trace(
" receive message, no callback, try call handler, seq:{} , type: {}, result: {}",
msg.getSeq(),
(int) msg.getType(),
msg.getResult());
MsgHandler msgHandler = msgHandlers.get(msg.getType().intValue());
if (msgHandler != null) {
logger.trace(
" receive message, no callback, call handler, seq:{} , type: {}, result: {}",
msg.getSeq(),
(int) msg.getType(),
msg.getResult());
msgHandler.onMessage(ctx, msg);
}
logger.debug(" call ");
}
}

Expand Down