digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 09:17:43 +03:00
Code Issues Projects Releases Wiki Activity

Fixes for trigger logback.xml config

Browse Source 
CHANGELOG_BEGIN
CHANGELOG_END
This commit is contained in:
Carl Pulley 2022-11-21 10:06:47 +00:00 committed by GitHub
parent b6af643f7d
commit 8c704407c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
triggers/runner/src/main/resources/logback.xml
View File

@ -1,15 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<appender name="STDOUT" class="net.logstash.logback.appender.LoggingEventAsyncDisruptorAppender">
<appender-ref ref="console" />
</appender>
<appender name="console" class="ch.qos.logback.core.ConsoleAppender"> <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<if condition='isDefined("LOG_FORMAT_JSON")'> <if condition='isDefined("LOG_FORMAT_JSON")'>
<then> <then>
<encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder"> <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
<layout class="net.logstash.logback.layout.LoggingEventCompositeJsonLayout"/>
</encoder>
</then> </then>
<else> <else>
<encoder> <encoder>
@ -19,6 +13,10 @@
</if> </if>
</appender> </appender>
<appender name="STDOUT" class="net.logstash.logback.appender.LoggingEventAsyncDisruptorAppender">
<appender-ref ref="console" />
</appender>
<logger name="io.netty" level="WARN" /> <logger name="io.netty" level="WARN" />
<logger name="io.grpc.netty" level="WARN" /> <logger name="io.grpc.netty" level="WARN" />
<logger name="akka.event.slf4j" level="WARN" /> <logger name="akka.event.slf4j" level="WARN" />

21
triggers/service/auth/release/oauth2-middleware-logback.xml
View File

@ -1,14 +1,8 @@
<configuration> <configuration>
<appender name="STDOUT" class="net.logstash.logback.appender.LoggingEventAsyncDisruptorAppender">
<appender-ref ref="console" />
</appender>
<appender name="console" class="ch.qos.logback.core.ConsoleAppender"> <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<if condition='isDefined("LOG_FORMAT_JSON")'> <if condition='isDefined("LOG_FORMAT_JSON")'>
<then> <then>
<encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder"> <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
<layout class="net.logstash.logback.layout.LoggingEventCompositeJsonLayout"/>
</encoder>
</then> </then>
<else> <else>
<encoder> <encoder>
@ -18,12 +12,13 @@
</if> </if>
</appender> </appender>
<logger name="io.netty" level="WARN"> <appender name="STDOUT" class="net.logstash.logback.appender.LoggingEventAsyncDisruptorAppender">
<appender-ref ref="STDOUT"/> <appender-ref ref="console"/>
</logger> </appender>
<logger name="io.grpc.netty" level="WARN">
<appender-ref ref="STDOUT"/> <logger name="io.netty" level="WARN"/>
</logger> <logger name="io.grpc.netty" level="WARN"/>
<root level="${LOG_LEVEL_ROOT:-INFO}"> <root level="${LOG_LEVEL_ROOT:-INFO}">
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT" />
</root> </root>

22
triggers/service/release/trigger-service-logback.xml
View File

@ -1,14 +1,8 @@
<configuration> <configuration>
<appender name="STDOUT" class="net.logstash.logback.appender.LoggingEventAsyncDisruptorAppender">
<appender-ref ref="console" />
</appender>
<appender name="console" class="ch.qos.logback.core.ConsoleAppender"> <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<if condition='isDefined("LOG_FORMAT_JSON")'> <if condition='isDefined("LOG_FORMAT_JSON")'>
<then> <then>
<encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder"> <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
<layout class="net.logstash.logback.layout.LoggingEventCompositeJsonLayout"/>
</encoder>
</then> </then>
<else> <else>
<encoder> <encoder>
@ -18,12 +12,14 @@
</if> </if>
</appender> </appender>
<logger name="io.netty" level="WARN"> <appender name="STDOUT" class="net.logstash.logback.appender.LoggingEventAsyncDisruptorAppender">
<appender-ref ref="STDOUT"/> <appender-ref ref="console"/>
</logger> </appender>
<logger name="io.grpc.netty" level="WARN">
<appender-ref ref="STDOUT"/> <logger name="io.netty" level="WARN"/>
</logger> <logger name="io.grpc.netty" level="WARN"/>
<logger name="com.daml.lf.engine.trigger" level="DEBUG"/>
<root level="${LOG_LEVEL_ROOT:-INFO}"> <root level="${LOG_LEVEL_ROOT:-INFO}">
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT" />
</root> </root>

24
triggers/service/src/test/resources/logback.xml
View File

@ -1,14 +1,8 @@
<configuration> <configuration>
<appender name="STDOUT" class="net.logstash.logback.appender.LoggingEventAsyncDisruptorAppender">
<appender-ref ref="console" />
</appender>
<appender name="console" class="ch.qos.logback.core.ConsoleAppender"> <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<if condition='isDefined("LOG_FORMAT_JSON")'> <if condition='isDefined("LOG_FORMAT_JSON")'>
<then> <then>
<encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder"> <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
<layout class="net.logstash.logback.layout.LoggingEventCompositeJsonLayout"/>
</encoder>
</then> </then>
<else> <else>
<encoder> <encoder>
@ -18,15 +12,13 @@
</if> </if>
</appender> </appender>
<logger name="io.netty" level="WARN"> <appender name="STDOUT" class="net.logstash.logback.appender.LoggingEventAsyncDisruptorAppender">
<appender-ref ref="STDOUT"/> <appender-ref ref="console"/>
</logger> </appender>
<logger name="io.grpc.netty" level="WARN">
<appender-ref ref="STDOUT"/> <logger name="io.netty" level="WARN"/>
</logger> <logger name="io.grpc.netty" level="WARN"/>
<logger name="com.daml.lf.engine.trigger" level="INFO"> <logger name="com.daml.lf.engine.trigger" level="DEBUG"/>
<appender-ref ref="STDOUT"/>
</logger>
<root level="${LOG_LEVEL_ROOT:-INFO}"> <root level="${LOG_LEVEL_ROOT:-INFO}">
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT" />