aboutsummaryrefslogtreecommitdiffstats
path: root/sources/hv-collector-core
diff options
context:
space:
mode:
authorkjaniak <kornel.janiak@nokia.com>2019-01-24 07:29:50 +0100
committerkjaniak <kornel.janiak@nokia.com>2019-01-25 15:30:17 +0100
commit68a3cf84da13b6f97628c8a0cee86c3323c780ce (patch)
tree15b267e18a38355eb69c2668a5bf42fa3d589d61 /sources/hv-collector-core
parent26efcca92b010f749d98bc25e5749e1079f072ae (diff)
Mitigation of unexpected hv-ves shutdown
Change-Id: I96183e2358ac10457568d223f37d69c61dfd252d Issue-ID: DCAEGEN2-1117 Signed-off-by: kjaniak <kornel.janiak@nokia.com>
Diffstat (limited to 'sources/hv-collector-core')
-rw-r--r--sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt8
1 files changed, 6 insertions, 2 deletions
diff --git a/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt
index c76233f0..adc629bc 100644
--- a/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt
+++ b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt
@@ -93,7 +93,12 @@ internal class NettyTcpServer(private val serverConfig: ServerConfiguration,
}
logger.debug(clientContext::fullMdc, Marker.Entry) { "Client connection request received" }
- return collectorProvider(clientContext).fold(
+ messageHandlingStream(clientContext, nettyInbound).subscribe()
+ return nettyOutbound.neverComplete()
+ }
+
+ private fun messageHandlingStream(clientContext: ClientContext, nettyInbound: NettyInbound): Mono<Void> =
+ collectorProvider(clientContext).fold(
{
logger.warn(clientContext::fullMdc) { "Collector not ready. Closing connection..." }
Mono.empty()
@@ -108,7 +113,6 @@ internal class NettyTcpServer(private val serverConfig: ServerConfiguration,
it.handleConnection(createDataStream(nettyInbound))
}
)
- }
private fun populateClientContext(clientContext: ClientContext, connection: Connection) {
clientContext.clientAddress = try {