Skip to content

Commit a2259ac

Browse files
adamretteradamretter
authored
Merge pull request #11 from evolvedbinary/7.x.x/hotfix/jetty-11-logging
[7.x.x] Make sure that Jetty requests are logged to the correct place
2 parents 000e838 + 70a7a5f commit a2259ac

File tree

30 files changed

+521
-160
lines changed

30 files changed

+521
-160
lines changed

‎exist-ant/src/test/resources/log4j2.xml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,12 @@
5050
<Properties>
5151
<Property name="logs">${log4j:configParentLocation}/../../target/test-logs-${date:yyyyMMddHHmmssSSS}</Property>
5252
<Property name="rollover.max.size">10MB</Property>
53+
<Property name="rollover.daily">0 0 0 * * ?</Property>
5354
<Property name="rollover.max">14</Property>
5455
<Property name="rollover.file.pattern">%d{yyyyMMddHHmmss}</Property>
55-
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m %n</Property>
56+
<Property name="rollover.daily.file.pattern">%d{yyyy-MM-dd}</Property>
57+
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m%n</Property>
58+
<Property name="request.file.pattern">%m%n</Property>
5659
</Properties>
5760

5861
<Appenders>
@@ -124,7 +127,15 @@
124127
<DefaultRolloverStrategy max="${rollover.max}"/>
125128
<PatternLayout pattern="${elemental.file.pattern}"/>
126129
</RollingRandomAccessFile>
127-
130+
131+
<RollingRandomAccessFile name="jetty.request" filePattern="${logs}/request.${rollover.daily.file.pattern}.log.gz" fileName="${logs}/request.log">
132+
<Policies>
133+
<CronTriggeringPolicy schedule="${rollover.daily}"/>
134+
</Policies>
135+
<DefaultRolloverStrategy max="${rollover.max}"/>
136+
<PatternLayout pattern="${request.file.pattern}"/>
137+
</RollingRandomAccessFile>
138+
128139
<RollingRandomAccessFile name="elemental.backup" filePattern="${logs}/backup.${rollover.file.pattern}.log.gz" fileName="${logs}/backup.log">
129140
<Policies>
130141
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
@@ -209,6 +220,10 @@
209220
<AppenderRef ref="elemental.restxq"/>
210221
</Logger>
211222

223+
<Logger name="org.eclipse.jetty.server.RequestLog" additivity="false" level="info">
224+
<AppenderRef ref="jetty.request"/>
225+
</Logger>
226+
212227
<Logger name="org.eclipse.jetty" additivity="false" level="info">
213228
<AppenderRef ref="elemental.core"/>
214229
</Logger>

‎exist-core/src/test/resources/log4j2.xml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,12 @@
5050
<Properties>
5151
<Property name="logs">${log4j:configParentLocation}/../../target/test-logs-${date:yyyyMMddHHmmssSSS}</Property>
5252
<Property name="rollover.max.size">10MB</Property>
53+
<Property name="rollover.daily">0 0 0 * * ?</Property>
5354
<Property name="rollover.max">14</Property>
5455
<Property name="rollover.file.pattern">%d{yyyyMMddHHmmss}</Property>
55-
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m %n</Property>
56+
<Property name="rollover.daily.file.pattern">%d{yyyy-MM-dd}</Property>
57+
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m%n</Property>
58+
<Property name="request.file.pattern">%m%n</Property>
5659
</Properties>
5760

5861
<Appenders>
@@ -120,7 +123,15 @@
120123
<DefaultRolloverStrategy max="${rollover.max}"/>
121124
<PatternLayout pattern="${elemental.file.pattern}"/>
122125
</RollingRandomAccessFile>
123-
126+
127+
<RollingRandomAccessFile name="jetty.request" filePattern="${logs}/request.${rollover.daily.file.pattern}.log.gz" fileName="${logs}/request.log">
128+
<Policies>
129+
<CronTriggeringPolicy schedule="${rollover.daily}"/>
130+
</Policies>
131+
<DefaultRolloverStrategy max="${rollover.max}"/>
132+
<PatternLayout pattern="${request.file.pattern}"/>
133+
</RollingRandomAccessFile>
134+
124135
<RollingRandomAccessFile name="elemental.backup" filePattern="${logs}/backup.${rollover.file.pattern}.log.gz" fileName="${logs}/backup.log">
125136
<Policies>
126137
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
@@ -203,6 +214,10 @@
203214
<AppenderRef ref="elemental.restxq"/>
204215
</Logger>
205216

217+
<Logger name="org.eclipse.jetty.server.RequestLog" additivity="false" level="info">
218+
<AppenderRef ref="jetty.request"/>
219+
</Logger>
220+
206221
<Logger name="org.eclipse.jetty" additivity="false" level="info">
207222
<AppenderRef ref="elemental.core"/>
208223
</Logger>

‎exist-distribution/src/main/config/log4j2.xml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
<Properties>
44
<Property name="logs">${log4j:configParentLocation}/../logs</Property>
55
<Property name="rollover.max.size">10MB</Property>
6+
<Property name="rollover.daily">0 0 0 * * ?</Property>
67
<Property name="rollover.max">14</Property>
78
<Property name="rollover.file.pattern">%d{yyyyMMddHHmmss}</Property>
8-
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m %n</Property>
9+
<Property name="rollover.daily.file.pattern">%d{yyyy-MM-dd}</Property>
10+
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m%n</Property>
11+
<Property name="request.file.pattern">%m%n</Property>
912
</Properties>
1013

1114
<Appenders>
@@ -93,7 +96,15 @@
9396
<DefaultRolloverStrategy max="${rollover.max}"/>
9497
<PatternLayout pattern="${elemental.file.pattern}"/>
9598
</RollingRandomAccessFile>
96-
99+
100+
<RollingRandomAccessFile name="jetty.request" filePattern="${logs}/request.${rollover.daily.file.pattern}.log.gz" fileName="${logs}/request.log">
101+
<Policies>
102+
<CronTriggeringPolicy schedule="${rollover.daily}"/>
103+
</Policies>
104+
<DefaultRolloverStrategy max="${rollover.max}"/>
105+
<PatternLayout pattern="${request.file.pattern}"/>
106+
</RollingRandomAccessFile>
107+
97108
<RollingRandomAccessFile name="elemental.backup" filePattern="${logs}/backup.${rollover.file.pattern}.log.gz" fileName="${logs}/backup.log">
98109
<Policies>
99110
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
@@ -186,6 +197,10 @@
186197
<AppenderRef ref="elemental.restxq"/>
187198
</Logger>
188199

200+
<Logger name="org.eclipse.jetty.server.RequestLog" additivity="false" level="info">
201+
<AppenderRef ref="jetty.request"/>
202+
</Logger>
203+
189204
<Logger name="org.eclipse.jetty" additivity="false" level="info">
190205
<AppenderRef ref="elemental.core"/>
191206
</Logger>

‎exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-logging.xml‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎exist-jetty-config/src/main/resources/org/exist/jetty/etc/standalone.enabled-jetty-configs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88

99

1010

11-
### Jetty log redirection
12-
# jetty-logging.xml # enable to redirect stdout and stderr to jetty.home/logs
13-
14-
1511
### Main Server Config
1612
jetty-bytebufferpool.xml
1713
jetty-threadpool.xml

‎exist-jetty-config/src/main/resources/org/exist/jetty/etc/standard.enabled-jetty-configs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88

99

1010

11-
### Jetty log redirection
12-
# jetty-logging.xml # enable to redirect stdout and stderr to jetty.home/logs
13-
14-
1511
### Main Server Config
1612
jetty-bytebufferpool.xml
1713
jetty-threadpool.xml

‎extensions/contentextraction/src/test/resources/log4j2.xml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,12 @@
5050
<Properties>
5151
<Property name="logs">${log4j:configParentLocation}/../../target/test-logs-${date:yyyyMMddHHmmssSSS}</Property>
5252
<Property name="rollover.max.size">10MB</Property>
53+
<Property name="rollover.daily">0 0 0 * * ?</Property>
5354
<Property name="rollover.max">14</Property>
5455
<Property name="rollover.file.pattern">%d{yyyyMMddHHmmss}</Property>
55-
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m %n</Property>
56+
<Property name="rollover.daily.file.pattern">%d{yyyy-MM-dd}</Property>
57+
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m%n</Property>
58+
<Property name="request.file.pattern">%m%n</Property>
5659
</Properties>
5760

5861
<Appenders>
@@ -120,7 +123,15 @@
120123
<DefaultRolloverStrategy max="${rollover.max}"/>
121124
<PatternLayout pattern="${elemental.file.pattern}"/>
122125
</RollingRandomAccessFile>
123-
126+
127+
<RollingRandomAccessFile name="jetty.request" filePattern="${logs}/request.${rollover.daily.file.pattern}.log.gz" fileName="${logs}/request.log">
128+
<Policies>
129+
<CronTriggeringPolicy schedule="${rollover.daily}"/>
130+
</Policies>
131+
<DefaultRolloverStrategy max="${rollover.max}"/>
132+
<PatternLayout pattern="${request.file.pattern}"/>
133+
</RollingRandomAccessFile>
134+
124135
<RollingRandomAccessFile name="elemental.backup" filePattern="${logs}/backup.${rollover.file.pattern}.log.gz" fileName="${logs}/backup.log">
125136
<Policies>
126137
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
@@ -203,6 +214,10 @@
203214
<AppenderRef ref="elemental.restxq"/>
204215
</Logger>
205216

217+
<Logger name="org.eclipse.jetty.server.RequestLog" additivity="false" level="info">
218+
<AppenderRef ref="jetty.request"/>
219+
</Logger>
220+
206221
<Logger name="org.eclipse.jetty" additivity="false" level="info">
207222
<AppenderRef ref="elemental.core"/>
208223
</Logger>

‎extensions/debuggee/src/test/resources/log4j2.xml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,12 @@
5050
<Properties>
5151
<Property name="logs">${log4j:configParentLocation}/../../target/test-logs-${date:yyyyMMddHHmmssSSS}</Property>
5252
<Property name="rollover.max.size">10MB</Property>
53+
<Property name="rollover.daily">0 0 0 * * ?</Property>
5354
<Property name="rollover.max">14</Property>
5455
<Property name="rollover.file.pattern">%d{yyyyMMddHHmmss}</Property>
55-
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m %n</Property>
56+
<Property name="rollover.daily.file.pattern">%d{yyyy-MM-dd}</Property>
57+
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m%n</Property>
58+
<Property name="request.file.pattern">%m%n</Property>
5659
</Properties>
5760

5861
<Appenders>
@@ -120,7 +123,15 @@
120123
<DefaultRolloverStrategy max="${rollover.max}"/>
121124
<PatternLayout pattern="${elemental.file.pattern}"/>
122125
</RollingRandomAccessFile>
123-
126+
127+
<RollingRandomAccessFile name="jetty.request" filePattern="${logs}/request.${rollover.daily.file.pattern}.log.gz" fileName="${logs}/request.log">
128+
<Policies>
129+
<CronTriggeringPolicy schedule="${rollover.daily}"/>
130+
</Policies>
131+
<DefaultRolloverStrategy max="${rollover.max}"/>
132+
<PatternLayout pattern="${request.file.pattern}"/>
133+
</RollingRandomAccessFile>
134+
124135
<RollingRandomAccessFile name="elemental.backup" filePattern="${logs}/backup.${rollover.file.pattern}.log.gz" fileName="${logs}/backup.log">
125136
<Policies>
126137
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
@@ -203,6 +214,10 @@
203214
<AppenderRef ref="elemental.restxq"/>
204215
</Logger>
205216

217+
<Logger name="org.eclipse.jetty.server.RequestLog" additivity="false" level="info">
218+
<AppenderRef ref="jetty.request"/>
219+
</Logger>
220+
206221
<Logger name="org.eclipse.jetty" additivity="false" level="info">
207222
<AppenderRef ref="elemental.core"/>
208223
</Logger>

‎extensions/expath/src/test/resources/log4j2.xml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,12 @@
5050
<Properties>
5151
<Property name="logs">${log4j:configParentLocation}/../../target/test-logs-${date:yyyyMMddHHmmssSSS}</Property>
5252
<Property name="rollover.max.size">10MB</Property>
53+
<Property name="rollover.daily">0 0 0 * * ?</Property>
5354
<Property name="rollover.max">14</Property>
5455
<Property name="rollover.file.pattern">%d{yyyyMMddHHmmss}</Property>
55-
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m %n</Property>
56+
<Property name="rollover.daily.file.pattern">%d{yyyy-MM-dd}</Property>
57+
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m%n</Property>
58+
<Property name="request.file.pattern">%m%n</Property>
5659
</Properties>
5760

5861
<Appenders>
@@ -120,7 +123,15 @@
120123
<DefaultRolloverStrategy max="${rollover.max}"/>
121124
<PatternLayout pattern="${elemental.file.pattern}"/>
122125
</RollingRandomAccessFile>
123-
126+
127+
<RollingRandomAccessFile name="jetty.request" filePattern="${logs}/request.${rollover.daily.file.pattern}.log.gz" fileName="${logs}/request.log">
128+
<Policies>
129+
<CronTriggeringPolicy schedule="${rollover.daily}"/>
130+
</Policies>
131+
<DefaultRolloverStrategy max="${rollover.max}"/>
132+
<PatternLayout pattern="${request.file.pattern}"/>
133+
</RollingRandomAccessFile>
134+
124135
<RollingRandomAccessFile name="elemental.backup" filePattern="${logs}/backup.${rollover.file.pattern}.log.gz" fileName="${logs}/backup.log">
125136
<Policies>
126137
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
@@ -203,6 +214,10 @@
203214
<AppenderRef ref="elemental.restxq"/>
204215
</Logger>
205216

217+
<Logger name="org.eclipse.jetty.server.RequestLog" additivity="false" level="info">
218+
<AppenderRef ref="jetty.request"/>
219+
</Logger>
220+
206221
<Logger name="org.eclipse.jetty" additivity="false" level="info">
207222
<AppenderRef ref="elemental.core"/>
208223
</Logger>

‎extensions/exquery/restxq/src/test/resources/log4j2.xml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,12 @@
3131
<Properties>
3232
<Property name="logs">${log4j:configParentLocation}/../../target/test-logs-${date:yyyyMMddHHmmssSSS}</Property>
3333
<Property name="rollover.max.size">10MB</Property>
34+
<Property name="rollover.daily">0 0 0 * * ?</Property>
3435
<Property name="rollover.max">14</Property>
3536
<Property name="rollover.file.pattern">%d{yyyyMMddHHmmss}</Property>
36-
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m %n</Property>
37+
<Property name="rollover.daily.file.pattern">%d{yyyy-MM-dd}</Property>
38+
<Property name="elemental.file.pattern">%d [%t] %-5p (%F [%M]:%L) - %m%n</Property>
39+
<Property name="request.file.pattern">%m%n</Property>
3740
</Properties>
3841

3942
<Appenders>
@@ -101,7 +104,15 @@
101104
<DefaultRolloverStrategy max="${rollover.max}"/>
102105
<PatternLayout pattern="${elemental.file.pattern}"/>
103106
</RollingRandomAccessFile>
104-
107+
108+
<RollingRandomAccessFile name="jetty.request" filePattern="${logs}/request.${rollover.daily.file.pattern}.log.gz" fileName="${logs}/request.log">
109+
<Policies>
110+
<CronTriggeringPolicy schedule="${rollover.daily}"/>
111+
</Policies>
112+
<DefaultRolloverStrategy max="${rollover.max}"/>
113+
<PatternLayout pattern="${request.file.pattern}"/>
114+
</RollingRandomAccessFile>
115+
105116
<RollingRandomAccessFile name="elemental.backup" filePattern="${logs}/backup.${rollover.file.pattern}.log.gz" fileName="${logs}/backup.log">
106117
<Policies>
107118
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
@@ -184,6 +195,10 @@
184195
<AppenderRef ref="elemental.restxq"/>
185196
</Logger>
186197

198+
<Logger name="org.eclipse.jetty.server.RequestLog" additivity="false" level="info">
199+
<AppenderRef ref="jetty.request"/>
200+
</Logger>
201+
187202
<Logger name="org.eclipse.jetty" additivity="false" level="info">
188203
<AppenderRef ref="elemental.core"/>
189204
</Logger>

0 commit comments

Comments
 (0)