diff options
Diffstat (limited to 'sources')
4 files changed, 21 insertions, 4 deletions
diff --git a/sources/hv-collector-core/src/test/resources/logback-test.xml b/sources/hv-collector-core/src/test/resources/logback-test.xml index f4cb6c59..06aa3adc 100644 --- a/sources/hv-collector-core/src/test/resources/logback-test.xml +++ b/sources/hv-collector-core/src/test/resources/logback-test.xml @@ -21,7 +21,7 @@ <configuration> <property name="p_tim" value="%date{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX", UTC}"/> <property name="p_lvl" value="%highlight(%-5level)"/> - <property name="p_log" value="%50.50logger"/>WireFrameCodecsTest + <property name="p_log" value="%50.50logger"/> <property name="SIMPLE_LOG_PATTERN" value=" %nopexception | ${p_tim}\t diff --git a/sources/hv-collector-ct/src/test/resources/logback-test.xml b/sources/hv-collector-ct/src/test/resources/logback-test.xml index fc80a2f2..40a20fc1 100644 --- a/sources/hv-collector-ct/src/test/resources/logback-test.xml +++ b/sources/hv-collector-ct/src/test/resources/logback-test.xml @@ -12,6 +12,18 @@ <property name="p_msg" value="%replace(%replace(%msg){'\t', '\\\\t'}){'\n','\\\\n'}"/> <property name="p_exc" value="%replace(%replace(%rootException){'\t', '\\\\t'}){'\n','\\\\n'}"/> <property name="p_mak" value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}"/> + + <property name="READABLE_LOG_PATTERN" value=" +%nopexception +| ${p_tim}\t +| ${p_log}\t +| ${p_lvl}\t +| %msg\t +| ${p_mak}\t +| %rootException\t +| ${p_mdc}\t +| ${p_thr}%n"/> + <property name="ONAP_LOG_PATTERN" value=" %nopexception | ${p_tim}\t @@ -25,7 +37,7 @@ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> <encoder> - <pattern>${ONAP_LOG_PATTERN}</pattern> + <pattern>${READABLE_LOG_PATTERN}</pattern> </encoder> </appender> diff --git a/sources/hv-collector-main/Dockerfile b/sources/hv-collector-main/Dockerfile index 0170b645..ad7a03d6 100644 --- a/sources/hv-collector-main/Dockerfile +++ b/sources/hv-collector-main/Dockerfile @@ -11,9 +11,9 @@ RUN apt-get update \ WORKDIR /opt/ves-hv-collector -ENTRYPOINT ["java", "-cp", "*:", "org.onap.dcae.collectors.veshv.main.MainKt"] +ENTRYPOINT ["entry.sh"] COPY target/libs/external/* ./ COPY target/libs/internal/* ./ -COPY src/main/scripts/healthcheck.sh ./ +COPY src/main/scripts/*.sh ./ COPY target/hv-collector-main-*.jar ./ diff --git a/sources/hv-collector-main/src/main/scripts/entry.sh b/sources/hv-collector-main/src/main/scripts/entry.sh new file mode 100755 index 00000000..2e8cb0c5 --- /dev/null +++ b/sources/hv-collector-main/src/main/scripts/entry.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -euo pipefail + +java ${JAVA_OPTS:-''} -cp '*:' org.onap.dcae.collectors.veshv.main.MainKt $@ |