[java-idp-jetty-base] branch 10-testbed-eclipse updated: Use Logback for logging
Tom Zeller
tzeller at dragonacea.biz
Tue Feb 8 16:15:55 UTC 2022
This is an automated email from the git hooks/post-receive script.
tzeller pushed a commit to branch 10-testbed-eclipse
in repository java-idp-jetty-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=6cc8f5a226f9cd0194b28a21da1f5a025b76278c
The following commit(s) were added to refs/heads/10-testbed-eclipse by this push:
new 6cc8f5a Use Logback for logging
6cc8f5a is described below
commit 6cc8f5a226f9cd0194b28a21da1f5a025b76278c
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Tue Feb 8 10:15:36 2022 -0600
Use Logback for logging
---
.../resources/jetty-base/etc/jetty-requestlog.xml | 30 ++++++++++++++++++++++
.../jetty-base/resources/jetty-logging.properties | 10 --------
.../resources/jetty-base/resources/logback.xml | 16 ++++++++++++
src/main/resources/jetty-base/start.d/idp.ini | 4 +++
.../resources/jetty-base/start.d/requestlog.ini | 27 -------------------
5 files changed, 50 insertions(+), 37 deletions(-)
diff --git a/src/main/resources/jetty-base/etc/jetty-requestlog.xml b/src/main/resources/jetty-base/etc/jetty-requestlog.xml
new file mode 100644
index 0000000..660f7b3
--- /dev/null
+++ b/src/main/resources/jetty-base/etc/jetty-requestlog.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
+
+<!-- =============================================================== -->
+<!-- Configure the Jetty Request Log -->
+<!-- =============================================================== -->
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+ <!-- =========================================================== -->
+ <!-- Configure Request Log for Server -->
+ <!-- Use RequestLogHandler for a context specific RequestLog -->
+ <!-- =========================================================== -->
+ <Set name="RequestLog">
+ <New id="RequestLog" class="org.eclipse.jetty.server.CustomRequestLog">
+ <!-- Writer -->
+ <Arg>
+ <New class="org.eclipse.jetty.server.Slf4jRequestLogWriter" />
+ </Arg>
+
+ <!-- Format String -->
+ <Arg>
+ <Property name="jetty.requestlog.formatString" deprecated="jetty.customrequestlog.formatString">
+ <Default>
+ <Get class="org.eclipse.jetty.server.CustomRequestLog" name="EXTENDED_NCSA_FORMAT"/>
+ </Default>
+ </Property>
+ </Arg>
+ </New>
+ </Set>
+</Configure>
diff --git a/src/main/resources/jetty-base/resources/jetty-logging.properties b/src/main/resources/jetty-base/resources/jetty-logging.properties
deleted file mode 100644
index fba9189..0000000
--- a/src/main/resources/jetty-base/resources/jetty-logging.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-## Set logging levels from: ALL, TRACE, DEBUG, INFO, WARN, ERROR, OFF
-org.eclipse.jetty.LEVEL=INFO
-## Configure a level for an arbitrary logger tree
-#com.example.LEVEL=INFO
-## Configure a level for specific logger
-#com.example.MyComponent.LEVEL=INFO
-## Configure JMX Context Name
-# org.eclipse.jetty.logging.jmx.context=JettyServer
-## Hide stacks traces in an arbitrary logger tree
-#com.example.STACKS=false
diff --git a/src/main/resources/jetty-base/resources/logback.xml b/src/main/resources/jetty-base/resources/logback.xml
index 8b9ea93..86acebf 100644
--- a/src/main/resources/jetty-base/resources/logback.xml
+++ b/src/main/resources/jetty-base/resources/logback.xml
@@ -10,9 +10,25 @@
<Pattern>%date{ISO8601} - %level [%logger:%line] - %msg%n</Pattern>
</encoder>
</appender>
+
+ <appender name="jetty-access" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${jetty.base}/logs/access.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>${jetty.base}/logs/access-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%msg%n</pattern>
+ </encoder>
+ </appender>
+
<root level="INFO">
<appender-ref ref="jetty" />
</root>
+
+ <logger name="org.eclipse.jetty.server.RequestLog" level="INFO" additivity="false">
+ <appender-ref ref="jetty-access" />
+ </logger>
+
<logger name="org.springframework" level="OFF" />
<logger name="ch.qos.logback" level="WARN" />
</configuration>
diff --git a/src/main/resources/jetty-base/start.d/idp.ini b/src/main/resources/jetty-base/start.d/idp.ini
index 40cd226..d52e920 100644
--- a/src/main/resources/jetty-base/start.d/idp.ini
+++ b/src/main/resources/jetty-base/start.d/idp.ini
@@ -2,6 +2,7 @@
# Module: idp
# Shibboleth IdP
# ---------------------------------------
+--module=logging-logback
--module=idp
## Keystore file path (relative to $jetty.base)
@@ -29,3 +30,6 @@ jetty.sslContext.renegotiationAllowed=false
## Connector port to listen on
jetty.ssl.port=443
+
+## Route request logging through standard logging API
+etc/jetty-requestlog.xml
diff --git a/src/main/resources/jetty-base/start.d/requestlog.ini b/src/main/resources/jetty-base/start.d/requestlog.ini
deleted file mode 100644
index 08fbea6..0000000
--- a/src/main/resources/jetty-base/start.d/requestlog.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# ---------------------------------------
-# Module: requestlog
-# Logs requests using CustomRequestLog and AsyncRequestLogWriter.
-# ---------------------------------------
---module=requestlog
-
-## Format string
-# jetty.requestlog.formatString=%a - %u %{dd/MMM/yyyy:HH:mm:ss ZZZ|GMT}t "%r" %s %B "%{Referer}i" "%{User-Agent}i" "%C"
-
-## Logging directory (relative to $jetty.base)
-# jetty.requestlog.dir=logs
-
-## File path
-# jetty.requestlog.filePath=${jetty.requestlog.dir}/yyyy_mm_dd.request.log
-
-## Date format for rollovered files (uses SimpleDateFormat syntax)
-# jetty.requestlog.filenameDateFormat=yyyy_MM_dd
-
-## How many days to retain old log files
-# jetty.requestlog.retainDays=90
-
-## Whether to append to existing file
-# jetty.requestlog.append=false
-
-## Timezone of the log file rollover
-# jetty.requestlog.timezone=GMT
-
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list