Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

provides reworked AeronTransport implementation #972

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
5 changes: 5 additions & 0 deletions build.gradle
Expand Up @@ -45,6 +45,7 @@ subprojects {
ext['assertj.version'] = '3.19.0'
ext['netflix.limits.version'] = '0.3.6'
ext['bouncycastle-bcpkix.version'] = '1.68'
ext['aeron.version'] = '1.31.1'

group = "io.rsocket"

Expand Down Expand Up @@ -87,6 +88,10 @@ subprojects {
entry 'jmh-core'
entry 'jmh-generator-annprocess'
}
dependencySet(group: 'io.aeron', version: ext['aeron.version']) {
entry 'aeron-client'
entry 'aeron-driver'
}
}
generatedPomCustomization {
enabled = false
Expand Down
Expand Up @@ -27,7 +27,7 @@ public abstract class BaseDuplexConnection implements DuplexConnection {
protected UnboundedProcessor sender = new UnboundedProcessor();

public BaseDuplexConnection() {
onClose().doFinally(s -> doOnClose()).subscribe();
onClose().subscribe(null, t -> doOnClose(), this::doOnClose);
}

@Override
Expand Down
Expand Up @@ -27,7 +27,9 @@ public KeepAliveFramesAcceptor start(
KeepAliveSupport keepAliveSupport,
Consumer<ByteBuf> onSendKeepAliveFrame,
Consumer<KeepAlive> onTimeout) {
duplexConnection.onClose().doFinally(s -> keepAliveSupport.stop()).subscribe();
duplexConnection
.onClose()
.subscribe(null, __ -> keepAliveSupport.stop(), keepAliveSupport::stop);
return keepAliveSupport
.onSendKeepAliveFrame(onSendKeepAliveFrame)
.onTimeout(onTimeout)
Expand Down