Skip to content

Commit e9b0d22

Browse files
committed
modify msg toString and net log info
1 parent c2a2cf6 commit e9b0d22

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

src/main/java/org/tron/common/overlay/server/Channel.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,10 @@ public void initNode(byte[] nodeId, int remotePort) {
151151
}
152152

153153
public void disconnect(ReasonCode reason) {
154-
logger.info("Send disconnect to {}, reason: {}", ctx.channel().remoteAddress(), reason);
154+
DisconnectMessage msg = new DisconnectMessage(reason);
155+
logger.info("Send to {}, {}", ctx.channel().remoteAddress(), msg);
155156
getNodeStatistics().nodeDisconnectedLocal(reason);
156-
ctx.writeAndFlush(new DisconnectMessage(reason).getSendData()).addListener(
157-
(ChannelFutureListener) future -> {
158-
close();
159-
});
157+
ctx.writeAndFlush(msg.getSendData()).addListener(future -> close());
160158
}
161159

162160
public void processException(Throwable throwable){
@@ -169,8 +167,7 @@ public void processException(Throwable throwable){
169167
if (throwable instanceof ReadTimeoutException){
170168
logger.error("Read timeout, {}", address);
171169
}else if(baseThrowable instanceof P2pException){
172-
logger.error("type: {}, info: {}, {}", ((P2pException) baseThrowable).getType(),
173-
((P2pException) baseThrowable).getMessage(), address);
170+
logger.error("type: {}, info: {}, {}", ((P2pException) baseThrowable).getType(), baseThrowable.getMessage(), address);
174171
}else if (errMsg != null && errMsg.contains("Connection reset by peer")){
175172
logger.error("{}, {}", errMsg, address);
176173
}else {

src/main/java/org/tron/common/overlay/server/HandshakeHandler.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> ou
7777
buffer.readBytes(encoded);
7878
P2pMessage msg = messageFactory.create(encoded);
7979

80-
logger.info("Handshake receive from {}, {}", ctx.channel().remoteAddress(), msg);
80+
logger.info("Handshake Receive from {}, {}", ctx.channel().remoteAddress(), msg);
8181

8282
switch (msg.getType()) {
8383
case P2P_HELLO:
@@ -106,10 +106,12 @@ public void setChannel(Channel channel, String remoteId) {
106106
}
107107

108108
private void sendHelloMsg(ChannelHandlerContext ctx, long time){
109+
109110
HelloMessage message = new HelloMessage(nodeManager.getPublicHomeNode(), time,
110111
manager.getGenesisBlockId(), manager.getSolidBlockId(), manager.getHeadBlockId());
111112
ctx.writeAndFlush(message.getSendData());
112113
channel.getNodeStatistics().p2pOutHello.add();
114+
logger.info("Handshake Send to {}, {} ", ctx.channel().remoteAddress(), message);
113115
}
114116

115117
private void handleHelloMsg(ChannelHandlerContext ctx, HelloMessage msg) {

src/main/java/org/tron/core/net/message/SyncBlockChainMessage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ public String toString() {
2424
int size = blockIdList.size();
2525
sb.append(super.toString()).append("size: ").append(size);
2626
if (size >= 1){
27-
sb.append(", start block: " + blockIdList.get(0));
27+
sb.append(", start block: " + blockIdList.get(0).getString());
2828
if (size > 1){
29-
sb.append(", end block " + blockIdList.get(blockIdList.size() - 1));
29+
sb.append(", end block " + blockIdList.get(blockIdList.size() - 1).getString());
3030
}
3131
}
3232
return sb.toString();

0 commit comments

Comments
 (0)