Skip to content

Acctivate access log #3755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sbrunner wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Acctivate access log #3755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion core/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ ENV LOG_LEVEL=INFO \
EXTRA_JARS= \
PRINT_YAML_MAX_ALIASES=50 \
JAVA_OPTS=-Dsun.net.inetaddr.ttl=30 \
SENTRY_DSN=
SENTRY_DSN= \
UMASK=0022 \
CATALINA_OPTS=${CATALINA_OPTS} -Dlogback.configurationFile=${CATALINA_HOME}/conf/logback.xml

CMD ["/usr/local/tomcat/bin/docker-start-print"]

Expand Down
4 changes: 0 additions & 4 deletions core/docker/usr/local/tomcat/bin/setenv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,3 @@ CLASSPATH=${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.ja
for jar in ${CATALINA_HOME}/lib/*; do
CLASSPATH=${CLASSPATH}:$jar
done

UMASK="0022"

CATALINA_OPTS="${CATALINA_OPTS} -Dlogback.configurationFile=${CATALINA_HOME}/conf/logback.xml"
5 changes: 3 additions & 2 deletions core/docker/usr/local/tomcat/conf/logback-access.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<configuration>
<?xml version="1.0" encoding="UTF-8"?>
<included>
<appender name="classic" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%h %l %u %user %date "%r" %s %b</pattern>
Expand Down Expand Up @@ -77,4 +78,4 @@


<appender-ref ref="${TOMCAT_LOG_TYPE}" />
</configuration>
</included>
30 changes: 2 additions & 28 deletions core/docker/usr/local/tomcat/conf/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<appender name="classic" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
<target>System.err</target>
</appender>

<appender name="json" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
<fieldNames>
<timestamp>timegenerated</timestamp>
<level>level_name</level>
<message>msg</message>
</fieldNames>
</encoder>
<target>System.err</target>
</appender>

<appender name="Sentry" class="io.sentry.logback.SentryAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>${SENTRY_REPORTING_LOG_LEVEL}</level>
</filter>
</appender>

<logger name="org.apache.catalina" level="${TOMCAT_LOG_LEVEL}"/>
<logger name="org.apache.coyote" level="${TOMCAT_LOG_LEVEL}"/>
<logger name="io.sentry" level="${SENTRY_LOG_LEVEL}"/>

<include file="${CATALINA_HOME}/conf/logback-base.xml"/>
<include file="${CATALINA_HOME}/conf/logback-custom.xml"/>
<include file="${CATALINA_HOME}/conf/logback-access.xml"/>

<root level="${DEFAULT_LOG_LEVEL}">
<appender-ref ref="${TOMCAT_LOG_TYPE}" />
Expand Down