From 4281a12d8e892f46f5f2226ee0f8aee8b862b177 Mon Sep 17 00:00:00 2001 From: kjaniak Date: Thu, 28 Mar 2019 10:43:59 +0100 Subject: Read HV-VES healthcheck api port from cmd line Change-Id: I6b4680a62512ef6ba15a0454e109b19619a997a6 Issue-ID: DCAEGEN2-1364 Signed-off-by: kjaniak --- .../src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt | 5 +++-- .../org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sources/hv-collector-main') diff --git a/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt index c8a3c013..059e8028 100644 --- a/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt +++ b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt @@ -38,10 +38,11 @@ private const val VES_HV_PACKAGE = "org.onap.dcae.collectors.veshv" private val logger = Logger("$VES_HV_PACKAGE.main") private val hvVesServer = AtomicReference() +private val configurationModule = ConfigurationModule() fun main(args: Array) { - HealthCheckServer.start() - ConfigurationModule() + HealthCheckServer.start(configurationModule.healthCheckPort(args)) + configurationModule .hvVesConfigurationUpdates(args) .publishOn(Schedulers.single(Schedulers.elastic())) .doOnNext(::startServer) diff --git a/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt index bc284d08..9b58dcc9 100644 --- a/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt +++ b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt @@ -34,10 +34,9 @@ import java.net.InetSocketAddress */ object HealthCheckServer { - private const val DEFAULT_HEALTHCHECK_PORT = 6060 private val logger = Logger(HealthCheckServer::class) - fun start(port: Int = DEFAULT_HEALTHCHECK_PORT) = + fun start(port: Int) = createHealthCheckServer(port) .start() .then(::logServerStarted) -- cgit 1.2.3-korg