diff options
| author |   Jim Hahn <jrh3@att.com> | 2020-01-09 13:43:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-01-09 13:43:45 +0000 |
| commit | 4cfde2fbf8390c980a96490c15440752851fd1c5 (patch) | |
| tree | 9330276de75aca22dd7d5b48ab60877dec075b69 | |
| parent | 38919c45aafa99d950eddf879b2bc25e95529378 (diff) | |
| parent | aae690873cf641561a7f55b5fe52bee0d9633294 (diff) | |
Merge "Enabling logback file to be loaded using oom configmap"
| -rw-r--r-- | packages/docker/src/main/docker/do-start.sh | 6 | ||||
| -rw-r--r-- | policy-management/src/main/server-gen/bin/policy-management-controller | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/packages/docker/src/main/docker/do-start.sh b/packages/docker/src/main/docker/do-start.sh index 4687e421..d565965c 100644 --- a/packages/docker/src/main/docker/do-start.sh +++ b/packages/docker/src/main/docker/do-start.sh @@ -4,6 +4,7 @@ # ONAP # ================================================================================ # Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2020 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -69,6 +70,11 @@ if [[ -f config/policy-truststore ]]; then cp -f config/policy-truststore ${POLICY_HOME}/etc/ssl fi +if [[ -f config/logback.xml ]]; then + echo "overriding logback.xml" + cp -f config/logback.xml "${POLICY_HOME}"/config/ +fi + # allow user to override all or some aaf configuration if [[ -f config/aaf.properties ]]; then diff --git a/policy-management/src/main/server-gen/bin/policy-management-controller b/policy-management/src/main/server-gen/bin/policy-management-controller index fe6fe20a..389f7d2e 100644 --- a/policy-management/src/main/server-gen/bin/policy-management-controller +++ b/policy-management/src/main/server-gen/bin/policy-management-controller @@ -31,7 +31,7 @@ function start() { update_monitor off else update_monitor on - fi + fi } # unmonitored start, does not change monitor status (immutable) @@ -165,7 +165,7 @@ function update_monitor() { if [[ -f ${POLICY_HOME}/etc/monitor/monitor.cfg ]]; then /bin/sed -i.bak \ -e "s/^${CONTROLLER}=.*/${CONTROLLER}=${STATUS}/g" \ - ${POLICY_HOME}/etc/monitor/monitor.cfg + ${POLICY_HOME}/etc/monitor/monitor.cfg fi } |