Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

Reduce log level when invalid messages received from peers #274

Merged
merged 9 commits into from
Nov 19, 2018
Merged

Reduce log level when invalid messages received from peers #274

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2c68aa9
Remove unused CompressionException.
ajsutton Nov 15, 2018
b2b2140
Drive by fix to make Pantheon more readable.
ajsutton Nov 15, 2018
fb9044a
Throw FramingException when snappy decompression fails. Handle Frami…
ajsutton Nov 18, 2018
cb85be6
Update test.
ajsutton Nov 18, 2018
01063f9
Check type of cause of DecoderException since Netty will have wrapped…
ajsutton Nov 18, 2018
6834807
Merge branch 'master' of github.com:PegaSysEng/pantheon into decompre…
ajsutton Nov 18, 2018
f065b9a
Merge branch 'master' into decompresision
ajsutton Nov 19, 2018
7e49542
Merge branch 'master' into decompresision
ajsutton Nov 19, 2018
9a145ff
Update changelog.
ajsutton Nov 19, 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
Prev Previous commit
Next Next commit
Check type of cause of DecoderException since Netty will have wrapped… 
… it.
  • Loading branch information
@ajsutton
ajsutton committed Nov 18, 2018
commit 01063f972ac10e474d1b1b42c7c6f859fe8cd6c6
9 changes: 7 additions & 2 deletions ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/DeFramer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
import io.netty.handler.codec.DecoderException;
import io.netty.handler.timeout.IdleStateHandler;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down Expand Up @@ -126,13 +127,17 @@ private PeerInfo parsePeerInfo(final MessageData message) {
@Override
public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable throwable)
throws Exception {
if (throwable instanceof FramingException) {
final Throwable cause =
throwable instanceof DecoderException && throwable.getCause() != null
? throwable.getCause()
: throwable;
if (cause instanceof FramingException) {
LOG.debug("Invalid incoming message", throwable);
if (connectFuture.isDone()) {
connectFuture.get().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
return;
}
} else if (throwable instanceof IOException) {
} else if (cause instanceof IOException) {
// IO failures are routine when communicating with random peers across the network.
LOG.debug("IO error while processing incoming message", throwable);
} else {
Expand Down