Merge branch 'develop' of https://github.com/tronprotocol/java-tron into develop

CodeNinjaEvan · CodeNinjaEvan · commit f0f63f201a3c · 2018-05-16T15:36:42.000+08:00
diff --git a/src/main/java/org/tron/common/overlay/message/DisconnectMessage.java b/src/main/java/org/tron/common/overlay/message/DisconnectMessage.java
@@ -8,18 +8,11 @@ public class DisconnectMessage extends P2pMessage {
 
   private Protocol.DisconnectMessage disconnectMessage;
 
-  public DisconnectMessage(byte[] rawData) {
-    super(rawData);
-    this.type = MessageTypes.P2P_DISCONNECT.asByte();
-  }
-
-  public DisconnectMessage(byte type, byte[] rawData) {
+  public DisconnectMessage(byte type, byte[] rawData) throws Exception{
     super(type, rawData);
+    this.disconnectMessage = Protocol.DisconnectMessage.parseFrom(this.data);
   }
 
-  /**
-   * The reason of disconnect.
-   */
   public DisconnectMessage(ReasonCode reasonCode) {
     this.disconnectMessage = Protocol.DisconnectMessage
         .newBuilder()
@@ -29,55 +22,17 @@ public DisconnectMessage(ReasonCode reasonCode) {
     this.data = this.disconnectMessage.toByteArray();
   }
 
-  private void unPack() {
-    try {
-      this.disconnectMessage = Protocol.DisconnectMessage.parseFrom(this.data);
-    } catch (InvalidProtocolBufferException e) {
-      logger.debug(e.getMessage(), e);
-    }
-    unpacked = true;
-  }
-
-  private void pack() {
-    this.data = this.disconnectMessage.toByteArray();
-  }
-
-  @Override
-  public byte[] getData() {
-    if (this.data == null) {
-      this.pack();
-    }
-    return this.data;
-  }
-
-  /**
-   * Get reason of disconnect.
-   */
   public int getReason() {
-    if (!this.unpacked) {
-      this.unPack();
-    }
-
     return this.disconnectMessage.getReason().getNumber();
   }
 
-  /**
-   * Print reason of disconnect.
-   */
+  @Override
   public String toString() {
-    if (!this.unpacked) {
-      this.unPack();
-    }
-    return "[" + this.getType().name() + " reason=" + this.getReason() + "]";
+    return new StringBuilder().append(super.toString()).append("reason: ").append(this.disconnectMessage.getReason()).toString();
   }
 
   @Override
   public Class<?> getAnswerMessage() {
     return null;
   }
-
-  @Override
-  public MessageTypes getType() {
-    return MessageTypes.fromByte(this.type);
-  }
 }
diff --git a/src/main/java/org/tron/common/overlay/message/HelloMessage.java b/src/main/java/org/tron/common/overlay/message/HelloMessage.java
@@ -131,7 +131,7 @@ public MessageTypes getType() {
 
   @Override
   public String toString() {
-    return helloMessage.toString();
+    return new StringBuilder().append(super.toString()).append(helloMessage.toString()).toString();
   }
 
 }
diff --git a/src/main/java/org/tron/common/overlay/message/Message.java b/src/main/java/org/tron/common/overlay/message/Message.java
@@ -51,7 +51,7 @@ public MessageTypes getType(){
 
   @Override
   public String toString() {
-    return "[Message Type: " + getType() + ", Message Hash: " + getMessageId() + "]";
+    return "type: " + getType() + "\n";
   }
 
   @Override
diff --git a/src/main/java/org/tron/common/overlay/server/Channel.java b/src/main/java/org/tron/common/overlay/server/Channel.java
@@ -151,12 +151,10 @@ public void initNode(byte[] nodeId, int remotePort) {
     }
 
     public void disconnect(ReasonCode reason) {
-        logger.info("Send disconnect to {}, reason:{}", ctx.channel().remoteAddress(), reason);
+        DisconnectMessage msg = new DisconnectMessage(reason);
+        logger.info("Send to {}, {}", ctx.channel().remoteAddress(), msg);
         getNodeStatistics().nodeDisconnectedLocal(reason);
-        ctx.writeAndFlush(new DisconnectMessage(reason).getSendData()).addListener(
-            (ChannelFutureListener) future -> {
-                close();
-            });
+        ctx.writeAndFlush(msg.getSendData()).addListener(future ->  close());
     }
 
     public void processException(Throwable throwable){
@@ -169,8 +167,7 @@ public void processException(Throwable throwable){
         if (throwable instanceof ReadTimeoutException){
             logger.error("Read timeout, {}", address);
         }else if(baseThrowable instanceof P2pException){
-            logger.error("type: {}, info: {}, {}", ((P2pException) baseThrowable).getType(),
-                    ((P2pException) baseThrowable).getMessage(), address);
+            logger.error("type: {}, info: {}, {}", ((P2pException) baseThrowable).getType(), baseThrowable.getMessage(), address);
         }else if (errMsg != null && errMsg.contains("Connection reset by peer")){
             logger.error("{}, {}", errMsg, address);
         }else {
diff --git a/src/main/java/org/tron/common/overlay/server/HandshakeHandler.java b/src/main/java/org/tron/common/overlay/server/HandshakeHandler.java
@@ -77,7 +77,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> ou
     buffer.readBytes(encoded);
     P2pMessage msg = messageFactory.create(encoded);
 
-    logger.info("Handshake receive from {}, {}", ctx.channel().remoteAddress(), msg);
+    logger.info("Handshake Receive from {}, {}", ctx.channel().remoteAddress(), msg);
 
     switch (msg.getType()) {
       case P2P_HELLO:
@@ -106,10 +106,12 @@ public void setChannel(Channel channel, String remoteId) {
   }
 
   private void sendHelloMsg(ChannelHandlerContext ctx, long time){
+
     HelloMessage message = new HelloMessage(nodeManager.getPublicHomeNode(), time,
             manager.getGenesisBlockId(), manager.getSolidBlockId(), manager.getHeadBlockId());
     ctx.writeAndFlush(message.getSendData());
     channel.getNodeStatistics().p2pOutHello.add();
+    logger.info("Handshake Send to {}, {} ", ctx.channel().remoteAddress(), message);
   }
 
   private void handleHelloMsg(ChannelHandlerContext ctx, HelloMessage msg) {
diff --git a/src/main/java/org/tron/common/overlay/server/MessageQueue.java b/src/main/java/org/tron/common/overlay/server/MessageQueue.java
@@ -67,11 +67,11 @@ public void activate(ChannelHandlerContext ctx) {
          Message msg = msgQueue.take();
          ctx.writeAndFlush(msg.getSendData()).addListener((ChannelFutureListener) future -> {
            if (!future.isSuccess()) {
-             logger.error("send {} to {} fail", msg, ctx.channel().remoteAddress());
+             logger.error("Fail send to {}, {}", ctx.channel().remoteAddress(),  msg);
            }
          });
        }catch (Exception e) {
-         logger.error("Send message failed, {}, error info: {}", ctx.channel().remoteAddress(), e.getMessage());
+         logger.error("Fail send to {}, error info: {}", ctx.channel().remoteAddress(), e.getMessage());
        }
      }
     });
@@ -84,15 +84,15 @@ public void setChannel(Channel channel) {
   }
 
   public void sendMessage(Message msg) {
-    logger.info("send {} to {}", msg, ctx.channel().remoteAddress());
+    logger.info("Send to {}, {} ", ctx.channel().remoteAddress(), msg);
     if (msg.getAnswerMessage() != null)
       requestQueue.add(new MessageRoundtrip(msg));
     else
       msgQueue.offer(msg);
   }
 
   public void receivedMessage(Message msg){
-    logger.info("rcv {} from {}", msg, ctx.channel().remoteAddress());
+    logger.info("Receive from {}, {}", ctx.channel().remoteAddress(), msg);
     MessageRoundtrip messageRoundtrip = requestQueue.peek();
     if (messageRoundtrip != null && messageRoundtrip.getMsg().getAnswerMessage() == msg.getClass()){
       requestQueue.remove();
@@ -134,7 +134,7 @@ private void send() {
 
     ctx.writeAndFlush(msg.getSendData()).addListener((ChannelFutureListener) future -> {
       if (!future.isSuccess()) {
-        logger.error("send {} to {} fail", msg, ctx.channel().remoteAddress());
+        logger.error("Fail send to {}, {}", ctx.channel().remoteAddress(), msg);
       }
     });
 
diff --git a/src/main/java/org/tron/core/net/message/BlockInventoryMessage.java b/src/main/java/org/tron/core/net/message/BlockInventoryMessage.java
@@ -18,13 +18,6 @@ public BlockInventoryMessage(byte[] data) throws Exception {
     this.blockInventory = Protocol.BlockInventory.parseFrom(data);
   }
 
-  @Override
-  public String toString() {
-    return "BlockInventory : " + (CollectionUtils.isNotEmpty(blockInventory.getIdsList())
-        ? blockInventory.getIdsList().size() : 0) +
-        "\n" + super.toString();
-  }
-
   @Override
   public Class<?> getAnswerMessage() {
     return null;
diff --git a/src/main/java/org/tron/core/net/message/BlockMessage.java b/src/main/java/org/tron/core/net/message/BlockMessage.java
@@ -62,9 +62,7 @@ public BlockCapsule getBlockCapsule() {
 
   @Override
   public String toString() {
-    return super.toString() + ",BlockMessage{" +
-        "\n blockHeader : " + block.getBlockHeader() +
-        "\n transaction size : " + block.getTransactionsList().size() +
-        "},";
+    return new StringBuilder().append(super.toString()).append(block.getBlockHeader().getRawData())
+            .append("trx size: ").append(block.getTransactionsList().size()).append("\n").toString();
   }
 }
diff --git a/src/main/java/org/tron/core/net/message/BlocksMessage.java b/src/main/java/org/tron/core/net/message/BlocksMessage.java
@@ -24,7 +24,7 @@ public List<Block> getBlocks() {
 
   @Override
   public String toString() {
-    return super.toString() + ", BlocksMessage size:" + (CollectionUtils.isNotEmpty(blocks) ? blocks
+    return super.toString() + "size: " + (CollectionUtils.isNotEmpty(blocks) ? blocks
         .size() : 0);
   }
 
diff --git a/src/main/java/org/tron/core/net/message/ChainInventoryMessage.java b/src/main/java/org/tron/core/net/message/ChainInventoryMessage.java
@@ -62,12 +62,15 @@ public Long getRemainNum() {
   @Override
   public String toString() {
     Deque<BlockId> blockIdWeGet = new LinkedList<>(getBlockIds());
-    StringBuilder sb = new StringBuilder(getType().toString()).append(" :");
-    return blockIdWeGet.isEmpty()
-        ? sb.append(" empty inv").toString()
-        : sb.append(" first blockId: ").append(blockIdWeGet.peek().getString())
-            .append(" end blockId: ").append(blockIdWeGet.peekLast().getString())
-            .append(" size: ").append(blockIdWeGet.size()).toString();
+    StringBuilder sb = new StringBuilder(super.toString());
+    int size = blockIdWeGet.size();
+    sb.append("size: ").append(size);
+    if (size >= 1){
+      sb.append(", first blockId: ").append(blockIdWeGet.peek().getString());
+      if (size > 1){
+        sb.append(", end blockId: ").append(blockIdWeGet.peekLast().getString());
+      }
+    }
+    return sb.toString();
   }
-
 }
diff --git a/src/main/java/org/tron/core/net/message/InventoryMessage.java b/src/main/java/org/tron/core/net/message/InventoryMessage.java
@@ -61,9 +61,9 @@ public InventoryType getInventoryType() {
   public String toString() {
     Deque<Sha256Hash> hashes = new LinkedList<>(getHashList());
     StringBuilder builder = new StringBuilder();
-    builder.append(getType()).append(":").append(getInvMessageType())
-            .append(", size=").append(hashes.size())
-            .append(", First hash:").append(hashes.peekFirst());
+    builder.append(super.toString()).append("invType: ").append(getInvMessageType())
+            .append(", size: ").append(hashes.size())
+            .append(", First hash: ").append(hashes.peekFirst());
     if (hashes.size() > 1){
       builder.append(", End hash: ").append(hashes.peekLast());
     }
diff --git a/src/main/java/org/tron/core/net/message/SyncBlockChainMessage.java b/src/main/java/org/tron/core/net/message/SyncBlockChainMessage.java
@@ -20,13 +20,14 @@ public SyncBlockChainMessage(List<BlockId> blockIds) {
   @Override
   public String toString() {
     List<BlockId> blockIdList = getBlockIds();
-    StringBuilder sb = new StringBuilder(getType().toString()).append(": ");
-    if (CollectionUtils.isNotEmpty(blockIdList)) {
-      sb.append("\n BlockIds size " + blockIdList.size());
-      sb.append("\n start block " + blockIdList.get(0));
-      sb.append("\n end block " + blockIdList.get(blockIdList.size() - 1));
-    } else {
-      sb.append("BlockIds size 0");
+    StringBuilder sb = new StringBuilder();
+    int size = blockIdList.size();
+    sb.append(super.toString()).append("size: ").append(size);
+    if (size >= 1){
+      sb.append(", start block: " + blockIdList.get(0).getString());
+      if (size > 1){
+        sb.append(", end block " + blockIdList.get(blockIdList.size() - 1).getString());
+      }
     }
     return sb.toString();
   }
diff --git a/src/main/java/org/tron/core/net/message/TransactionsMessage.java b/src/main/java/org/tron/core/net/message/TransactionsMessage.java
@@ -30,7 +30,8 @@ public Protocol.Transactions getTransactions() {
 
   @Override
   public String toString() {
-    return "trx_size:" + this.transactions.getTransactionsList().size();
+    return new StringBuilder().append(super.toString()).append(", trx_size: ")
+            .append(this.transactions.getTransactionsList().size()).toString();
   }
 
   @Override
diff --git a/src/main/java/org/tron/core/net/node/NodeImpl.java b/src/main/java/org/tron/core/net/node/NodeImpl.java
@@ -284,7 +284,6 @@ public Thread newThread(Runnable r) {
 
   @Override
   public void onMessage(PeerConnection peer, TronMessage msg) {
-    logger.info("Handle Message: " + msg + " from \nPeer: " + peer);
     switch (msg.getType()) {
       case BLOCK:
         onHandleBlockMessage(peer, (BlockMessage) msg);
@@ -875,14 +874,11 @@ private void onHandleTransactionMessage(PeerConnection peer, TransactionMessage
   }
 
   private void onHandleTransactionsMessage(PeerConnection peer, TransactionsMessage msg) {
-    logger.info("onHandleTransactionsMessage, size = {}, peer {}",
-        msg.getTransactions().getTransactionsList().size(), peer.getNode().getHost());
     msg.getTransactions().getTransactionsList().forEach(transaction ->
         onHandleTransactionMessage(peer, new TransactionMessage(transaction)));
   }
 
   private void onHandleSyncBlockChainMessage(PeerConnection peer, SyncBlockChainMessage syncMsg) {
-    //logger.info("on handle sync block chain message");
     peer.setTronState(TronState.SYNCING);
     LinkedList<BlockId> blockIds = new LinkedList<>();
     List<BlockId> summaryChainIds = syncMsg.getBlockIds();
@@ -895,12 +891,10 @@ private void onHandleSyncBlockChainMessage(PeerConnection peer, SyncBlockChainMe
     }
 
     if (blockIds.isEmpty()) {
-      if (CollectionUtils.isNotEmpty(summaryChainIds)
-          && !del.canChainRevoke(summaryChainIds.get(0).getNum())) {
-        logger.info(
-            "Node sync block fail, disconnect peer:{}, sync message:{}",
-            peer, syncMsg);
+      if (CollectionUtils.isNotEmpty(summaryChainIds) && !del.canChainRevoke(summaryChainIds.get(0).getNum())) {
+        logger.info("Node sync block fail, disconnect peer {}, no block {}", peer, summaryChainIds.get(0).getString());
         peer.disconnect(ReasonCode.SYNC_FAIL);
+        return;
       } else {
         peer.setNeedSyncFromUs(false);
       }
diff --git a/src/main/java/org/tron/core/services/WitnessService.java b/src/main/java/org/tron/core/services/WitnessService.java
@@ -83,6 +83,8 @@ public WitnessService(Application tronApp) {
             logger.info("ProductionLoop interrupted");
           } catch (Exception ex) {
             logger.error("unknown exception happened in witness loop", ex);
+          }catch (Throwable  throwable){
+            logger.error("unknown throwable happened in witness loop", throwable);
           }
         }
       };

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public MessageTypes getType() {`
`131`	`131`
`132`	`132`	`@Override`
`133`	`133`	`public String toString() {`
`134`		`- return helloMessage.toString();`
	`134`	`+ return new StringBuilder().append(super.toString()).append(helloMessage.toString()).toString();`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public MessageTypes getType(){`
`51`	`51`
`52`	`52`	`@Override`
`53`	`53`	`public String toString() {`
`54`		`- return "[Message Type: " + getType() + ", Message Hash: " + getMessageId() + "]";`
	`54`	`+ return "type: " + getType() + "\n";`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,7 @@ public BlockCapsule getBlockCapsule() {`
`62`	`62`
`63`	`63`	`@Override`
`64`	`64`	`public String toString() {`
`65`		`- return super.toString() + ",BlockMessage{" +`
`66`		`- "\n blockHeader : " + block.getBlockHeader() +`
`67`		`- "\n transaction size : " + block.getTransactionsList().size() +`
`68`		`- "},";`
	`65`	`+ return new StringBuilder().append(super.toString()).append(block.getBlockHeader().getRawData())`
	`66`	`+ .append("trx size: ").append(block.getTransactionsList().size()).append("\n").toString();`
`69`	`67`	`}`
`70`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public List<Block> getBlocks() {`
`24`	`24`
`25`	`25`	`@Override`
`26`	`26`	`public String toString() {`
`27`		`- return super.toString() + ", BlocksMessage size:" + (CollectionUtils.isNotEmpty(blocks) ? blocks`
	`27`	`+ return super.toString() + "size: " + (CollectionUtils.isNotEmpty(blocks) ? blocks`
`28`	`28`	`.size() : 0);`
`29`	`29`	`}`
`30`	`30`