mdf pushTransactions

xxo1shine · xxo1shine · commit af552ee62ed3 · 2018-04-29T22:03:47.000+08:00
diff --git a/src/main/java/org/tron/common/overlay/server/ChannelManager.java b/src/main/java/org/tron/common/overlay/server/ChannelManager.java
@@ -20,18 +20,23 @@
 import static org.tron.common.overlay.message.ReasonCode.DUPLICATE_PEER;
 import static org.tron.common.overlay.message.ReasonCode.TOO_MANY_PEERS;
 
+import java.io.IOException;
 import java.net.InetAddress;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.timeout.ReadTimeoutException;
 import org.apache.commons.collections4.map.LRUMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.tron.common.overlay.message.DisconnectMessage;
 import org.tron.common.overlay.message.ReasonCode;
 import org.tron.core.config.args.Args;
 import org.tron.core.db.ByteArrayWrapper;
@@ -153,6 +158,17 @@ public Collection<Channel> getActivePeers() {
     return new ArrayList<>(activePeers.values());
   }
 
+  public void processException(ChannelHandlerContext ctx, Throwable throwable){
+      if (throwable instanceof ReadTimeoutException){
+          logger.error("Read timeout, {}", ctx.channel().remoteAddress());
+      }else if (throwable.getMessage().contains("Connection reset by peer")){
+          logger.error("Connection reset by peer, {}", ctx.channel().remoteAddress());
+      }else {
+          logger.error("exception caught, {}", ctx.channel().remoteAddress(), throwable);
+      }
+      ctx.close();
+  }
+
   public void close() {
     try {
       mainWorker.shutdownNow();
diff --git a/src/main/java/org/tron/common/overlay/server/HandshakeHandler.java b/src/main/java/org/tron/common/overlay/server/HandshakeHandler.java
@@ -114,8 +114,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> ou
 
   @Override
   public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-    logger.info("exception caught, {}", ctx.channel().remoteAddress(), cause);
-    ctx.close();
+    channelManager.processException(ctx, cause);
   }
 
   public void setChannel(Channel channel, String remoteId) {
diff --git a/src/main/java/org/tron/core/db/Manager.java b/src/main/java/org/tron/core/db/Manager.java
@@ -408,7 +408,8 @@ public synchronized boolean pushTransactions(final TransactionCapsule trx)
     if (!trx.validateSignature()) {
       throw new ValidateSignatureException("trans sig validate failed");
     }
-    validateTapos(trx);
+
+    //validateTapos(trx);
         
     validateFreq(trx);
 

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> ou`
`114`	`114`
`115`	`115`	`@Override`
`116`	`116`	`public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {`
`117`		`- logger.info("exception caught, {}", ctx.channel().remoteAddress(), cause);`
`118`		`- ctx.close();`
	`117`	`+ channelManager.processException(ctx, cause);`
`119`	`118`	`}`
`120`	`119`
`121`	`120`	`public void setChannel(Channel channel, String remoteId) {`
Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,8 @@ public synchronized boolean pushTransactions(final TransactionCapsule trx)`
`408`	`408`	`if (!trx.validateSignature()) {`
`409`	`409`	`throw new ValidateSignatureException("trans sig validate failed");`
`410`	`410`	`}`
`411`		`- validateTapos(trx);`
	`411`	`+`
	`412`	`+ //validateTapos(trx);`
`412`	`413`
`413`	`414`	`validateFreq(trx);`
`414`	`415`