StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

problem: reconnects WS too often when the only response is an error

Browse Source
This commit is contained in:
Igor Artamonov
2022-08-25 19:18:19 -04:00
committed by terminal
parent f791aa98ff
commit 2412132b08
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/WsConnection.kt
View File

@@ -96,7 +96,7 @@ open class WsConnection(
private var reconnectBackoff: BackOff = ExponentialBackOff().also {
it.initialInterval = Duration.ofMillis(100).toMillis()
it.maxInterval = Duration.ofMinutes(1).toMillis()
it.maxInterval = Duration.ofMinutes(5).toMillis()
}
private var currentBackOff = reconnectBackoff.start()
@@ -229,18 +229,20 @@ open class WsConnection(
val consumer = inbound
.aggregateFrames(msgSizeLimit)
.receiveFrames()
.doOnNext {
if (!read) {
// restart backoff only after a successful read from the connection,
// otherwise it may restart it even if the connection is faulty
currentBackOff = reconnectBackoff.start()
read = true
}
}
.map { ByteBufInputStream(it.content()).readAllBytes() }
.flatMap {
try {
val msg = parser.parse(it)
if (!read) {
if (msg.error != null) {
log.warn("Received error ${msg.error.code} from $uri: ${msg.error.message}")
} else {
// restart backoff only after a successful read from the connection,
// otherwise it may restart it even if the connection is faulty or responds only with error
currentBackOff = reconnectBackoff.start()
read = true
}
}
if (msg.type == ResponseWSParser.Type.SUBSCRIPTION) {
onSubscription(msg)
} else {