Skip to content

fix bug of print message conteent #198

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 1 commit into from
Nov 17, 2020
Merged

fix bug of print message conteent #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/AmopImp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 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 @@ -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);
Expand Down
12 changes: 6 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 @@ -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) {
Expand All @@ -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);
Expand Down