diff options
| author |   Brinda Santh <bs2796@att.com> | 2020-01-17 15:08:46 -0500 |
|---|---|---|
| committer | Brinda Santh <bs2796@att.com> | 2020-01-17 15:08:46 -0500 |
| commit | fed6c23200eba54f0f1995e56bbaf6a6c1f42396 (patch) | |
| tree | cf7b8bef791b82deaf9b9e913db5ac24d95cca2c /ms/blueprintsprocessor/modules | |
| parent | 8029f8e5332f107267ec11293c3099e54e87c67b (diff) | |
Fix scheduler shutdown config function.
Optimize application name accessing in Docker Compose.
Issue-ID: CCSDK-1917
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: I6b055de7ef5a8ac4a0c103499997ed272bd74ac6
Diffstat (limited to 'ms/blueprintsprocessor/modules')
2 files changed, 2 insertions, 4 deletions
diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt index d1254b24e..50cc44279 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt @@ -24,9 +24,7 @@ package org.onap.ccsdk.cds.controllerblueprints.core */ object BluePrintConstants { - val APP_NAME = System.getProperty("APPLICATION_NAME") - ?: System.getProperty("APP_NAME") - ?: System.getProperty("APPNAME") + val APP_NAME = System.getenv("APP_NAME") ?: "cds-controller" const val DATE_TIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" diff --git a/ms/blueprintsprocessor/modules/commons/nats-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/TokenAuthNatsService.kt b/ms/blueprintsprocessor/modules/commons/nats-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/TokenAuthNatsService.kt index 43a43bc03..7c24b70d0 100644 --- a/ms/blueprintsprocessor/modules/commons/nats-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/TokenAuthNatsService.kt +++ b/ms/blueprintsprocessor/modules/commons/nats-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/TokenAuthNatsService.kt @@ -35,7 +35,7 @@ open class TokenAuthNatsService(private val natsConnectionProperties: TokenAuthN if (!::streamingConnection.isInitialized) { log.info( "NATS connection requesting for cluster(${natsConnectionProperties.clusterId}) with" + - "clientId($natsConnectionProperties.clientId)" + "clientId(${natsConnectionProperties.clientId})" ) val serverList = natsConnectionProperties.host.splitCommaAsList() |