Skip to content

p2p: mdf msg queue close func #695

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
May 10, 2018
Merged

p2p: mdf msg queue close func #695

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1d92f2
mdf msg queue
xxo1shine May 10, 2018
ceeebfd
mdf msg queue
xxo1shine May 10, 2018
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
13 changes: 11 additions & 2 deletions src/main/java/org/tron/common/overlay/server/MessageQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class MessageQueue {

private static final Logger logger = LoggerFactory.getLogger("MessageQueue");

private boolean sendMsgFlag = false;
private volatile boolean sendMsgFlag = false;

private Thread sendMsgThread;

Expand Down Expand Up @@ -70,7 +70,7 @@ public void activate(ChannelHandlerContext ctx) {
Message msg = msgQueue.take();
ctx.writeAndFlush(msg.getSendData()).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
}catch (Exception e) {
logger.error("send message failed, {}, error info: {}", ctx.channel().remoteAddress(), e.getMessage());
logger.error("Send message failed, {}, error info: {}", ctx.channel().remoteAddress(), e.getMessage());
}
}
});
Expand Down Expand Up @@ -102,6 +102,15 @@ public void close() {
sendMsgFlag = false;
if(sendTask != null && !sendTask.isCancelled()){
sendTask.cancel(false);
sendTask = null;
}
if (sendMsgThread != null){
try{
sendMsgThread.join(20);
sendMsgThread = null;
}catch (Exception e){
logger.warn("Join send thread failed, peer {}", ctx.channel().remoteAddress());
}
}
}

Expand Down