net: optimize some logs for network module

framework/src/main/java/org/tron/common/backup/BackupManager.java

@@ -72,7 +72,7 @@ public void init() {
     try {
       localIp = InetAddress.getLocalHost().getHostAddress();
     } catch (Exception e) {
-      logger.warn("Failed to get local ip.");
+      logger.warn("Failed to get local ip");
     }
 
     for (String member : parameter.getBackupMembers()) {
@@ -105,7 +105,7 @@ public void init() {
             .accept(new UdpEvent(new KeepAliveMessage(status.equals(MASTER), priority),
                 new InetSocketAddress(member, port))));
       } catch (Throwable t) {
-        logger.error("Exception in send keep alive.", t);
+        logger.error("Exception in send keep alive", t);
       }
     }, 1000, keepAliveInterval, TimeUnit.MILLISECONDS);
   }
@@ -120,7 +120,7 @@ public void handleEvent(UdpEvent udpEvent) {
       return;
     }
     if (!members.contains(sender.getHostString())) {
-      logger.warn("Receive keep alive message from {} is not my member.", sender.getHostString());
+      logger.warn("Receive keep alive message from {} is not my member", sender.getHostString());
       return;
     }
 

framework/src/main/java/org/tron/common/net/udp/handler/MessageHandler.java

@@ -78,7 +78,8 @@ public void channelReadComplete(ChannelHandlerContext ctx) {
 
   @Override
   public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-    logger.info("Exception caught, {} {}", ctx.channel().remoteAddress(), cause.getMessage());
+    logger.warn("Exception caught in udp message handler, {} {}",
+        ctx.channel().remoteAddress(), cause.getMessage());
     ctx.close();
   }
 }

framework/src/main/java/org/tron/common/overlay/client/PeerClient.java

@@ -45,8 +45,7 @@ public void connect(String host, int port, String remoteId) {
       ChannelFuture f = connectAsync(host, port, remoteId, false);
       f.sync().channel().closeFuture().sync();
     } catch (Exception e) {
-      logger
-          .info("PeerClient: Can't connect to " + host + ":" + port + " (" + e.getMessage() + ")");
+      logger.info("Can't connect to {}:{}, cause:{})", host, port, e.getMessage());
     }
   }
 
@@ -55,7 +54,7 @@ public ChannelFuture connectAsync(NodeHandler nodeHandler, boolean discoveryMode
     return connectAsync(node.getHost(), node.getPort(), node.getHexId(), discoveryMode)
         .addListener((ChannelFutureListener) future -> {
           if (!future.isSuccess()) {
-            logger.warn("Connect to {}:{} fail,cause:{}", node.getHost(), node.getPort(),
+            logger.warn("Connect to {}:{} fail, cause:{}", node.getHost(), node.getPort(),
                 future.cause().getMessage());
             nodeHandler.getNodeStatistics().nodeDisconnectedLocal(ReasonCode.CONNECT_FAIL);
             nodeHandler.getNodeStatistics().notifyDisconnect();
@@ -67,7 +66,7 @@ public ChannelFuture connectAsync(NodeHandler nodeHandler, boolean discoveryMode
   private ChannelFuture connectAsync(String host, int port, String remoteId,
       boolean discoveryMode) {
 
-    logger.info("Connect peer {} {} {}", host, port, remoteId);
+    logger.info("Connect peer {}:{}, remoteId:{}", host, port, remoteId);
 
     TronChannelInitializer tronChannelInitializer = ctx
         .getBean(TronChannelInitializer.class, remoteId);

framework/src/main/java/org/tron/common/overlay/discover/DiscoverServer.java

@@ -68,7 +68,7 @@ public DiscoverServer(final NodeManager nodeManager) {
           try {
             start();
           } catch (Exception e) {
-            logger.error("Discovery server start failed.", e);
+            logger.error("Discovery server start failed", e);
           }
         }, "DiscoverServer").start();
       }
@@ -111,10 +111,10 @@ public void initChannel(NioDatagramChannel ch)
         Thread.sleep(5000);
       }
     } catch (InterruptedException e) {
-      logger.warn("Discover server interrupted.");
+      logger.warn("Discover server interrupted");
       Thread.currentThread().interrupt();
     } catch (Exception e) {
-      logger.error("Start discovery server with port {} failed.", port, e);
+      logger.error("Start discovery server with port {} failed", port, e);
     } finally {
       group.shutdownGracefully().sync();
     }
@@ -127,15 +127,15 @@ public void close() {
       try {
         channel.close().await(10, TimeUnit.SECONDS);
       } catch (Exception e) {
-        logger.warn("Closing discovery server failed.", e);
+        logger.error("Closing discovery server failed", e);
       }
     }
 
     if (discoveryExecutor != null) {
       try {
         discoveryExecutor.close();
       } catch (Exception e) {
-        logger.warn("Closing discovery executor failed.", e);
+        logger.error("Closing discovery executor failed", e);
       }
     }
   }

framework/src/main/java/org/tron/common/overlay/discover/node/NodeHandler.java

@@ -184,7 +184,7 @@ public void handlePong(PongMessage msg) {
 
   public void handleNeighbours(NeighborsMessage msg) {
     if (!waitForNeighbors) {
-      logger.warn("Receive neighbors from {} without send find nodes.", node.getHost());
+      logger.warn("Receive neighbors from {} without send find nodes", node.getHost());
       return;
     }
     waitForNeighbors = false;
@@ -231,7 +231,7 @@ public void sendPing() {
           handleTimedOut();
         }
       } catch (Exception e) {
-        logger.error("Unhandled exception", e);
+        logger.error("Unhandled exception in pong timer schedule", e);
       }
     }, pingTimeout, TimeUnit.MILLISECONDS);
   }

framework/src/main/java/org/tron/common/overlay/discover/node/NodeManager.java

@@ -123,13 +123,13 @@ private void dbRead() {
         return;
       }
       DBNode dbNode = JsonUtil.json2Obj(new String(nodeBytes), DBNode.class);
-      logger.info("Reading node statistics from store: {} nodes.", dbNode.getNodes().size());
+      logger.info("Reading node statistics from store: {} nodes", dbNode.getNodes().size());
       dbNode.getNodes().forEach(n -> {
         Node node = new Node(n.getId(), n.getHost(), n.getPort());
         getNodeHandler(node).getNodeStatistics().setPersistedReputation(n.getReputation());
       });
     } catch (Exception e) {
-      logger.error("DB read node failed.", e);
+      logger.error("DB read node failed", e);
     }
   }
 
@@ -153,13 +153,13 @@ private void dbWrite() {
 
       dbNode.setNodes(batch);
 
-      logger.info("Write node statistics to store: m:{}/t:{}/{}/{} nodes.",
+      logger.info("Write node statistics to store: m:{}/t:{}/{}/{} nodes",
           nodeHandlerMap.size(), getTable().getAllNodes().size(), size, batch.size());
 
       chainBaseManager.getCommonStore()
           .put(DB_KEY_PEERS, new BytesCapsule(JsonUtil.obj2Json(dbNode).getBytes()));
     } catch (Exception e) {
-      logger.error("DB write node failed.", e);
+      logger.error("DB write node failed", e);
     }
   }
 
@@ -307,7 +307,7 @@ public void close() {
       nodeManagerTasksTimer.cancel();
       pongTimer.shutdownNow();
     } catch (Exception e) {
-      logger.warn("Close failed.", e);
+      logger.error("Close nodeManagerTasksTimer or pongTimer failed", e);
     }
   }
 

framework/src/main/java/org/tron/common/overlay/message/HelloMessage.java

@@ -127,7 +127,9 @@ public String toString() {
     return new StringBuilder().append(super.toString()).append(", ")
             .append("from: ").append(getFrom()).append(", ")
             .append("timestamp: ").append(getTimestamp()).append(", ")
-            .append("headBlockId: {").append(getHeadBlockId().getString()).append("}")
+            .append("headBlockId: {").append(getHeadBlockId().getString()).append("}, ")
+            .append("nodeType: ").append(helloMessage.getNodeType()).append(", ")
+            .append("lowestBlockNum: ").append(helloMessage.getLowestBlockNum())
             .toString();
   }
 

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

@@ -120,7 +120,7 @@ public void publicHandshakeFinished(ChannelHandlerContext ctx, HelloMessage msg)
     setStartTime(msg.getTimestamp());
     setTronState(TronState.HANDSHAKE_FINISHED);
     getNodeStatistics().p2pHandShake.add();
-    logger.info("Finish handshake with {}.", ctx.channel().remoteAddress());
+    logger.info("Finish handshake with {}", ctx.channel().remoteAddress());
   }
 
   /**
@@ -215,7 +215,7 @@ public void setStartTime(long startTime) {
 
   public void setTronState(TronState tronState) {
     this.tronState = tronState;
-    logger.info("Peer {} status change to {}.", inetSocketAddress, tronState);
+    logger.info("Peer {} status change to {}", inetSocketAddress, tronState);
   }
 
   public boolean isActive() {

framework/src/main/java/org/tron/common/overlay/server/ChannelManager.java

@@ -93,7 +93,7 @@ public void init() {
       fastForwardNodes.put(address, node);
     }
 
-    logger.info("Node config, trust {}, active {}, forward {}.",
+    logger.info("Node config, trust {}, active {}, forward {}",
         trustNodes.size(), activeNodes.size(), fastForwardNodes.size());
 
     peerConnectionCheckService.init();
@@ -140,7 +140,7 @@ public synchronized boolean processPeer(Channel peer) {
 
     if (trustNodes.getIfPresent(peer.getInetAddress()) == null) {
       if (recentlyDisconnected.getIfPresent(peer) != null) {
-        logger.info("Peer {} recently disconnected.", peer.getInetAddress());
+        logger.info("Peer {} recently disconnected", peer.getInetAddress());
         return false;
       }
 

framework/src/main/java/org/tron/common/overlay/server/FastForward.java

@@ -139,7 +139,7 @@ public boolean checkHelloMessage(HelloMessage message, Channel channel) {
       }
       return flag;
     } catch (Exception e) {
-      logger.warn("Check hello message failed, msg: {}, {}", message, channel.getInetAddress(), e);
+      logger.error("Check hello message failed, msg: {}, {}", message, channel.getInetAddress(), e);
       return false;
     }
   }

framework/src/main/java/org/tron/common/overlay/server/MessageQueue.java

@@ -77,14 +77,14 @@ public void activate(ChannelHandlerContext ctx) {
           }
           ctx.writeAndFlush(msg.getSendData()).addListener((ChannelFutureListener) future -> {
             if (!future.isSuccess() && !channel.isDisconnect()) {
-              logger.warn("Failed to send to {}, {}", ctx.channel().remoteAddress(), msg);
+              logger.warn("Failed to send to {}, {} ", ctx.channel().remoteAddress(), msg);
             }
           });
         } catch (InterruptedException e) {
-          logger.warn("Send message server interrupted.");
+          logger.warn("Send message server interrupted");
           Thread.currentThread().interrupt();
         } catch (Exception e) {
-          logger.error("Failed to send to {}.", ctx.channel().remoteAddress(), e);
+          logger.error("Failed to send to {} ", ctx.channel().remoteAddress(), e);
         }
       }
     });
@@ -162,7 +162,7 @@ public void close() {
         sendMsgThread.join(20);
         sendMsgThread = null;
       } catch (InterruptedException e) {
-        logger.warn("Send message join interrupted.");
+        logger.warn("Send message join interrupted");
         Thread.currentThread().interrupt();
       } catch (Exception e) {
         logger.warn("Join send thread failed, peer {}", ctx.channel().remoteAddress());
@@ -196,7 +196,7 @@ private void send() {
     }
     if (rt.getRetryTimes() > 0) {
       channel.getNodeStatistics().nodeDisconnectedLocal(ReasonCode.PING_TIMEOUT);
-      logger.warn("Wait {} timeout. close channel {}.",
+      logger.warn("Wait {} timeout. close channel {}",
           rt.getMsg().getAnswerMessage(), ctx.channel().remoteAddress());
       channel.close();
       return;

framework/src/main/java/org/tron/common/overlay/server/PeerConnectionCheckService.java

@@ -30,18 +30,18 @@ public void init() {
     if (isFastForward || !isOpenFullTcpDisconnect) {
       return;
     }
-    logger.info("Start peer connection check service.");
+    logger.info("Start peer connection check service");
     poolLoopExecutor.scheduleWithFixedDelay(() -> {
       try {
         check();
       } catch (Throwable t) {
-        logger.error("Exception in peer connection check.", t);
+        logger.error("Exception in peer connection check", t);
       }
     }, 10, 30, TimeUnit.SECONDS);
   }
 
   public void close() {
-    logger.info("Close peer connection check service.");
+    logger.info("Close peer connection check service");
     poolLoopExecutor.shutdown();
   }
 

framework/src/main/java/org/tron/common/overlay/server/PeerServer.java

@@ -63,7 +63,7 @@ public void start(int port) {
       logger.info("TCP listener closed");
 
     } catch (Exception e) {
-      logger.error("Start TCP server failed.", e);
+      logger.error("Start TCP server failed", e);
     } finally {
       workerGroup.shutdownGracefully();
       bossGroup.shutdownGracefully();
@@ -77,7 +77,7 @@ public void close() {
         logger.info("Closing TCP server...");
         channelFuture.channel().close().sync();
       } catch (Exception e) {
-        logger.warn("Closing TCP server failed.", e);
+        logger.error("Closing TCP server failed", e);
       }
     }
   }

framework/src/main/java/org/tron/common/overlay/server/SyncPool.java

@@ -225,7 +225,7 @@ public void close() {
       poolLoopExecutor.shutdownNow();
       logExecutor.shutdownNow();
     } catch (Exception e) {
-      logger.warn("Problems shutting down executor", e);
+      logger.error("Problems shutting down executor", e);
     }
   }
 

framework/src/main/java/org/tron/core/net/TronNetDelegate.java

@@ -220,7 +220,7 @@ public void processBlock(BlockCapsule block, boolean isSync) throws P2pException
         && dbManager.getLatestSolidityNumShutDown() == dbManager.getDynamicPropertiesStore()
         .getLatestBlockHeaderNumberFromDB()) {
 
-      logger.info("Begin shutdown, currentBlockNum:{}, DbBlockNum:{} ,solidifiedBlockNum:{}.",
+      logger.info("Begin shutdown, currentBlockNum:{}, DbBlockNum:{}, solidifiedBlockNum:{}",
           dbManager.getDynamicPropertiesStore().getLatestBlockHeaderNumber(),
           dbManager.getDynamicPropertiesStore().getLatestBlockHeaderNumberFromDB(),
           dbManager.getDynamicPropertiesStore().getLatestSolidifiedBlockNum());
@@ -252,7 +252,7 @@ public void processBlock(BlockCapsule block, boolean isSync) throws P2pException
           dbManager.pushBlock(block);
           Metrics.histogramObserve(timer);
           freshBlockId.put(blockId, System.currentTimeMillis());
-          logger.info("Success process block {}.", blockId.getString());
+          logger.info("Success process block {}", blockId.getString());
           if (!backupServerStartFlag
               && System.currentTimeMillis() - block.getTimeStamp() < BLOCK_PRODUCED_INTERVAL) {
             backupServerStartFlag = true;
@@ -278,7 +278,7 @@ public void processBlock(BlockCapsule block, boolean isSync) throws P2pException
           | ZksnarkException
           | EventBloomException e) {
         metricsService.failProcessBlock(block.getNum(), e.getMessage());
-        logger.error("Process block failed, {}, reason: {}.", blockId.getString(), e.getMessage());
+        logger.error("Process block failed, {}, reason: {}", blockId.getString(), e.getMessage());
         throw new P2pException(TypeEnum.BAD_BLOCK, e);
       }
     }

framework/src/main/java/org/tron/core/net/TronNetService.java

@@ -77,18 +77,18 @@ public void start() {
     peerStatusCheck.init();
     transactionsMsgHandler.init();
     fetchBlockService.init();
-    logger.info("TronNetService start successfully.");
+    logger.info("TronNetService start successfully");
   }
 
   public void stop() {
-    logger.info("TronNetService closed start.");
+    logger.info("TronNetService closed start");
     channelManager.close();
     advService.close();
     syncService.close();
     peerStatusCheck.close();
     transactionsMsgHandler.close();
     fetchBlockService.close();
-    logger.info("TronNetService closed successfully.");
+    logger.info("TronNetService closed successfully");
   }
 
   public int fastBroadcastTransaction(TransactionMessage msg) {
@@ -170,7 +170,7 @@ private void processException(PeerConnection peer, TronMessage msg, Exception ex
           code = ReasonCode.UNKNOWN;
           break;
       }
-      logger.warn("Message from {} process failed, {} \n type: {}, detail: {}.",
+      logger.warn("Message from {} process failed, {} \n type: {}, detail: {}",
           peer.getInetAddress(), msg, type, ex.getMessage());
     } else {
       code = ReasonCode.UNKNOWN;

framework/src/main/java/org/tron/core/net/messagehandler/BlockMsgHandler.java

@@ -119,7 +119,7 @@ private void check(PeerConnection peer, BlockMessage msg) throws P2pException {
   private void processBlock(PeerConnection peer, BlockCapsule block) throws P2pException {
     BlockId blockId = block.getBlockId();
     if (!tronNetDelegate.containBlock(block.getParentBlockId())) {
-      logger.warn("Get unlink block {} from {}, head is {}.", blockId.getString(),
+      logger.warn("Get unlink block {} from {}, head is {}", blockId.getString(),
               peer.getInetAddress(), tronNetDelegate.getHeadBlockId().getString());
       syncService.startSync(peer);
       return;

framework/src/main/java/org/tron/core/net/messagehandler/InventoryMsgHandler.java

@@ -49,15 +49,15 @@ private boolean check(PeerConnection peer, InventoryMessage inventoryMessage) {
     int size = inventoryMessage.getHashList().size();
 
     if (peer.isNeedSyncFromPeer() || peer.isNeedSyncFromUs()) {
-      logger.warn("Drop inv: {} size: {} from Peer {}, syncFromUs: {}, syncFromPeer: {}.",
+      logger.warn("Drop inv: {} size: {} from Peer {}, syncFromUs: {}, syncFromPeer: {}",
           type, size, peer.getInetAddress(), peer.isNeedSyncFromUs(), peer.isNeedSyncFromPeer());
       return false;
     }
 
     if (type.equals(InventoryType.TRX)) {
       int count = peer.getNodeStatistics().messageStatistics.tronInTrxInventoryElement.getCount(10);
       if (count > maxCountIn10s) {
-        logger.warn("Drop inv: {} size: {} from Peer {}, Inv count: {} is overload.",
+        logger.warn("Drop inv: {} size: {} from Peer {}, Inv count: {} is overload",
             type, size, peer.getInetAddress(), count);
         if (Args.getInstance().isOpenPrintLog()) {
           logger.warn("[overload]Drop tx list is: {}", inventoryMessage.getHashList());
@@ -66,7 +66,7 @@ private boolean check(PeerConnection peer, InventoryMessage inventoryMessage) {
       }
 
       if (transactionsMsgHandler.isBusy()) {
-        logger.warn("Drop inv: {} size: {} from Peer {}, transactionsMsgHandler is busy.",
+        logger.warn("Drop inv: {} size: {} from Peer {}, transactionsMsgHandler is busy",
             type, size, peer.getInetAddress());
         if (Args.getInstance().isOpenPrintLog()) {
           logger.warn("[isBusy]Drop tx list is: {}", inventoryMessage.getHashList());