Fix log of Element container is not visible at Standard Output

Issue-ID: POLICY-4351
Change-Id: I5f06c7158654fc14c2549772f8416eb1fc5bb07b
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>

diff --git a/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh b/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh
index e162201..2254886 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh
+++ b/packages/policy-clamp-docker/src/main/docker/acm-runtime.sh
@@ -45,8 +45,8 @@ if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then
 fi
 
 if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then
-    echo "overriding logback xml files"
-    cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
+    echo "overriding logback xml file"
+    cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/
 fi
 
 $JAVA_HOME/bin/java \

diff --git a/packages/policy-clamp-docker/src/main/docker/element-participant.sh b/packages/policy-clamp-docker/src/main/docker/element-participant.sh
index 8055a4d..54836f6 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/element-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/element-participant.sh
@@ -45,8 +45,8 @@ if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then
 fi
 
 if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then
-    echo "overriding logback xml files"
-    cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
+    echo "overriding logback xml file"
+    cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/
 fi
 
 $JAVA_HOME/bin/java \

diff --git a/packages/policy-clamp-docker/src/main/docker/http-participant.sh b/packages/policy-clamp-docker/src/main/docker/http-participant.sh
index 3e33b1a..78f5c1a 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/http-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/http-participant.sh
@@ -45,8 +45,8 @@ if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then
 fi
 
 if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then
-    echo "overriding logback xml files"
-    cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
+    echo "overriding logback xml file"
+    cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/
 fi
 
 $JAVA_HOME/bin/java \

diff --git a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh b/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh
index 95a9b15..9440b4b 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh
@@ -45,8 +45,8 @@ if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then
 fi
 
 if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then
-    echo "overriding logback xml files"
-    cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
+    echo "overriding logback xml file"
+    cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/
 fi
 
 $JAVA_HOME/bin/java \

diff --git a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
index fe9cf69..1e10ae0 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/policy-participant.sh
@@ -45,8 +45,8 @@ if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then
 fi
 
 if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then
-    echo "overriding logback xml files"
-    cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
+    echo "overriding logback xml file"
+    cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/
 fi
 
 $JAVA_HOME/bin/java \

diff --git a/participant/participant-impl/participant-impl-acelement/src/main/java/org/onap/policy/clamp/acm/element/service/ConfigService.java b/participant/participant-impl/participant-impl-acelement/src/main/java/org/onap/policy/clamp/acm/element/service/ConfigService.java
index 78ddad6..ff07cef 100644 (file)
--- a/participant/participant-impl/participant-impl-acelement/src/main/java/org/onap/policy/clamp/acm/element/service/ConfigService.java
+++ b/participant/participant-impl/participant-impl-acelement/src/main/java/org/onap/policy/clamp/acm/element/service/ConfigService.java
@@ -28,7 +28,6 @@ import org.onap.policy.clamp.acm.element.handler.MessageActivator;
 import org.onap.policy.clamp.acm.element.handler.MessageHandler;
 import org.onap.policy.clamp.acm.element.main.parameters.ElementTopicParameters;
 import org.onap.policy.clamp.common.acm.exception.AutomationCompositionRuntimeException;
-import org.onap.policy.clamp.models.acm.messages.dmaap.element.ElementMessage;
 import org.onap.policy.clamp.models.acm.messages.rest.element.ElementConfig;
 import org.onap.policy.common.endpoints.parameters.TopicParameterGroup;
 import org.slf4j.Logger;

diff --git a/participant/participant-impl/participant-impl-acelement/src/main/java/org/onap/policy/clamp/acm/element/service/SinkService.java b/participant/participant-impl/participant-impl-acelement/src/main/java/org/onap/policy/clamp/acm/element/service/SinkService.java
index 61c1c78..6de8255 100644 (file)
--- a/participant/participant-impl/participant-impl-acelement/src/main/java/org/onap/policy/clamp/acm/element/service/SinkService.java
+++ b/participant/participant-impl/participant-impl-acelement/src/main/java/org/onap/policy/clamp/acm/element/service/SinkService.java
@@ -20,7 +20,10 @@
 
 package org.onap.policy.clamp.acm.element.service;
 
+import org.onap.policy.clamp.models.acm.messages.dmaap.element.ElementMessage;
 import org.onap.policy.clamp.models.acm.messages.rest.element.ElementType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 /**
@@ -29,6 +32,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class SinkService extends AbstractElementService {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(SinkService.class);
+
+    @Override
+    public void handleMessage(ElementMessage message) {
+        LOGGER.info("Cycle completed in sink service with the full message: " + message);
+    }
+
     @Override
     public ElementType getType() {
         return ElementType.SINK;