Enabling logback file to be loaded using oom configmap

Change-Id: I4828559ff62ffc3ee41f89448a6f7e9914a2a0ba
Issue-ID: POLICY-2308
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>

diff --git a/packages/docker/src/main/docker/do-start.sh b/packages/docker/src/main/docker/do-start.sh
index 4687e42..d565965 100644 (file)
--- 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 fe6fe20..389f7d2 100644 (file)
--- 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
 }