Skip to content

feat(db): add timeout sending of zmq #5012

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
317787106 merged 4 commits into from
Feb 20, 2023
Merged

feat(db): add timeout sending of zmq #5012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8862018
feat(db): add sending timeout of zmq
317787106 Feb 20, 2023
69deaae
fix(db): use constant ZMQ_SEND_TIME_OUT
317787106 Feb 20, 2023
6b2a7f9
fix(net): optimize log of P2pEventHandlerImpl
317787106 Feb 20, 2023
14c1c80
fix(db): reorder setSendTimeOut function
317787106 Feb 20, 2023
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: 2 additions & 1 deletion framework/src/main/java/org/tron/common/logsfilter/nativequeue/NativeMessageQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public class NativeMessageQueue {

private static final int DEFAULT_BIND_PORT = 5555;
private static final int DEFAULT_QUEUE_LENGTH = 1000;
private static final int ZMQ_SEND_TIME_OUT = 1_000;
private static NativeMessageQueue instance;
private ZContext context = null;
private ZMQ.Socket publisher = null;
Expand All @@ -33,7 +34,7 @@ public boolean start(int bindPort, int sendQueueLength) {
if (Objects.isNull(publisher)) {
return false;
}

publisher.setSendTimeOut(ZMQ_SEND_TIME_OUT);
if (bindPort == 0 || bindPort < 0) {
bindPort = DEFAULT_BIND_PORT;
}
Expand Down
4 changes: 2 additions & 2 deletions framework/src/main/java/org/tron/core/net/P2pEventHandlerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,10 @@ private void processException(PeerConnection peer, TronMessage msg, Exception ex
break;
}
if (type.equals(P2pException.TypeEnum.BAD_MESSAGE)) {
logger.error("Message from {} process failed, {} \n type: {}",
logger.error("Message from {} process failed, {} \n type: ({})",
peer.getInetSocketAddress(), msg, type, ex);
} else {
logger.warn("Message from {} process failed, {} \n type: {}, detail: {}",
logger.warn("Message from {} process failed, {} \n type: ({}), detail: {}",
peer.getInetSocketAddress(), msg, type, ex.getMessage());
}
} else {
Expand Down