Skip to content

Commit 8ef6d79

Browse files
committed
Revert "fix: prevent pipeline errors from killing Reactor subscription (#205)"
This reverts commit 72315ae.
1 parent ccb2731 commit 8ef6d79

2 files changed

Lines changed: 1 addition & 19 deletions

File tree

src/main/java/org/ethereum/beacon/discovery/pipeline/PipelineImpl.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,7 @@ public class PipelineImpl implements Pipeline {
2929
public synchronized Pipeline build() {
3030
started.set(true);
3131
for (EnvelopeHandler handler : envelopeHandlers) {
32-
pipeline =
33-
pipeline.doOnNext(
34-
envelope -> {
35-
try {
36-
handler.handle(envelope);
37-
} catch (Throwable t) {
38-
LOG.warn(
39-
"Unexpected error in pipeline handler {}",
40-
handler.getClass().getSimpleName(),
41-
t);
42-
}
43-
});
32+
pipeline = pipeline.doOnNext(handler::handle);
4433
}
4534
Flux.from(pipeline)
4635
.onErrorContinue(

src/main/java/org/ethereum/beacon/discovery/pipeline/handler/HandshakeMessagePacketHandler.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,6 @@ public void handle(Envelope envelope) {
151151
packet, session.getNodeRecord(), session.getState()),
152152
ex);
153153
markHandshakeAsFailed(envelope, session);
154-
} catch (Throwable t) {
155-
LOG.warn(
156-
"Unexpected error while processing handshake [{}] from node {}",
157-
packet,
158-
session.getNodeRecord(),
159-
t);
160-
markHandshakeAsFailed(envelope, session);
161154
}
162155
}
163156

0 commit comments

Comments
 (0)