diff options
author | vasraz <vasyl.razinkov@est.tech> | 2022-11-30 17:21:48 +0000 |
---|---|---|
committer | Vasyl Razinkov <vasyl.razinkov@est.tech> | 2022-11-30 17:22:58 +0000 |
commit | 597cee12965358d4081450cfaeb8c8038d96f7c2 (patch) | |
tree | 616e8963876fbdaabff5cd0aa610d0425fcd06a4 /sdc-workflow-designer-be | |
parent | 94c088520cc5978daaa7757c9c6491f037c8cccc (diff) |
Fix SDC-WORKFLOW-DESIGNER-BE not logging to STDOUT
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I9d9515aa44c823404f05eefe668c222543693790
Issue-ID: SDC-3549
Diffstat (limited to 'sdc-workflow-designer-be')
4 files changed, 51 insertions, 6 deletions
diff --git a/sdc-workflow-designer-be/docker/Dockerfile b/sdc-workflow-designer-be/docker/Dockerfile index 1aaf4b69..3611b3cb 100644 --- a/sdc-workflow-designer-be/docker/Dockerfile +++ b/sdc-workflow-designer-be/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/integration-java11:7.1.0 +FROM onap/integration-java11:10.0.0 EXPOSE 8080 diff --git a/sdc-workflow-designer-be/pom.xml b/sdc-workflow-designer-be/pom.xml index 598b176d..ff4c4999 100644 --- a/sdc-workflow-designer-be/pom.xml +++ b/sdc-workflow-designer-be/pom.xml @@ -49,6 +49,12 @@ <dependencies> <dependency> + <groupId>org.codehaus.janino</groupId> + <artifactId>janino</artifactId> + <version>3.0.16</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.glassfish</groupId> <artifactId>jakarta.el</artifactId> <version>${org.glassfish.version}</version> diff --git a/sdc-workflow-designer-be/src/main/resources/application.properties b/sdc-workflow-designer-be/src/main/resources/application.properties index d64d7a9f..8a21a3d9 100644 --- a/sdc-workflow-designer-be/src/main/resources/application.properties +++ b/sdc-workflow-designer-be/src/main/resources/application.properties @@ -49,6 +49,8 @@ spring.data.cassandra.jmx-enabled=false #Actuators management.endpoint.health.show-details=always +spring.output.ansi.enabled=always + #Headers are comma separated list onap.logging.requestIdHeader=X-ECOMP-RequestID,X-ONAP-RequestID onap.logging.partnerNameHeader=USER_ID @@ -57,10 +59,15 @@ logging.level.org.springframework=INFO logging.level.org.onap.sdc.workflow=INFO #output to a temp_folder/file -logging.file=${java.io.tmpdir}/application.log +#logging.file=${java.io.tmpdir}/application.log +logging.file.path=logs/ +logging.file.name=logs/application.log # Logging pattern for the console logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss} - %msg%n # Logging pattern for file logging.pattern.file= %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg% + +debug=true +trace=true diff --git a/sdc-workflow-designer-be/src/main/resources/logback.xml b/sdc-workflow-designer-be/src/main/resources/logback.xml index f0a4bcb2..3af70eaf 100644 --- a/sdc-workflow-designer-be/src/main/resources/logback.xml +++ b/sdc-workflow-designer-be/src/main/resources/logback.xml @@ -16,12 +16,16 @@ ~ limitations under the License. --> -<configuration> +<configuration scan="true" scanPeriod="9 seconds"> <property scope="system" name="ONAP-component-name" value="workflow-designer"/> <property scope="system" name="ONAP-subcomponent-name" value="backend"/> <property name="log.home" value="/var/log/ONAP"/> <property name="log.location" value="${log.home}/${ONAP-component-name}/${ONAP-subcomponent-name}"/> + <property name="error-log-pattern" + value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestID}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ErrorCategory}|%X{ErrorCode}|${p_msg} ${p_ex}|%n%nopex"/> + <property name="debug-log-pattern" + value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestID}|${p_debugInfo} ${p_ex}|^\n%n%nopex"/> <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender"> @@ -161,6 +165,33 @@ </encoder> </appender> + <appender name="ERROR_STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> + <level>WARN</level> + </filter> + + <encoder> + <pattern> + %d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%level||%X{ErrorCode}|%X{ErrorDescription}|%msg%n + </pattern> + </encoder> + </appender> + <appender name="DEBUG_STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> + <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator --> + <expression>return level <= INFO;</expression> + </evaluator> + <OnMismatch>DENY</OnMismatch> + <OnMatch>ACCEPT</OnMatch> + </filter> + + <encoder> + <pattern> + %d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%msg%n + </pattern> + </encoder> + </appender> + <logger name="org.openecomp" level="info" additivity="false"> <appender-ref ref="ERROR"/> <appender-ref ref="ASYNC_DEBUG"/> @@ -179,8 +210,9 @@ <include resource="org/springframework/boot/logging/logback/defaults.xml" /> <include resource="org/springframework/boot/logging/logback/console-appender.xml" /> - <root level="error"> - <appender-ref ref="CONSOLE"/> + <root level="INFO"> + <appender-ref ref="DEBUG_STDOUT"/> + <appender-ref ref="ERROR_STDOUT"/> </root> <logger name="org.springframework.web" level="error"> @@ -191,4 +223,4 @@ <appender-ref ref="CONSOLE"/> </logger> -</configuration>
\ No newline at end of file +</configuration> |