Skip to content

Commit 70a7a5f

Browse files
adamretteradamretter
committed
[bugfix] Correct outdated log configuration
1 parent caac69b commit 70a7a5f

File tree

1 file changed

+67
-64
lines changed
  • extensions/modules/image/src/test/resources

1 file changed

+67
-64
lines changed

‎extensions/modules/image/src/test/resources/log4j2.xml‎

Lines changed: 67 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -36,76 +36,84 @@
3636

3737
<Appenders>
3838

39-
<RollingRandomAccessFile name="exist.core" filePattern="${logs}/exist.${rollover.file.pattern}.log.gz" fileName="${logs}/exist.log">
39+
<RollingRandomAccessFile name="elemental.core" filePattern="${logs}/elemental.${rollover.file.pattern}.log.gz" fileName="${logs}/elemental.log">
4040
<Policies>
4141
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
4242
</Policies>
4343
<DefaultRolloverStrategy max="${rollover.max}"/>
44-
<PatternLayout pattern="${exist.file.pattern}"/>
44+
<PatternLayout pattern="${elemental.file.pattern}"/>
4545
</RollingRandomAccessFile>
4646

47-
<RollingRandomAccessFile name="exist.xmldb" filePattern="${logs}/xmldb.${rollover.file.pattern}.log.gz" fileName="${logs}/xmldb.log">
47+
<RollingRandomAccessFile name="elemental.locks" filePattern="${logs}/locks.${rollover.file.pattern}.log.gz" fileName="${logs}/locks.log">
4848
<Policies>
4949
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
5050
</Policies>
5151
<DefaultRolloverStrategy max="${rollover.max}"/>
52-
<PatternLayout pattern="${exist.file.pattern}"/>
52+
<PatternLayout pattern="%d %-5p - %m %n"/>
5353
</RollingRandomAccessFile>
5454

55-
<RollingRandomAccessFile name="exist.xmlrpc" filePattern="${logs}/xmlrpc.${rollover.file.pattern}.log.gz" fileName="${logs}/xmlrpc.log">
55+
<RollingRandomAccessFile name="elemental.ensurelocking" filePattern="${logs}/locks.${rollover.file.pattern}.log.gz" fileName="${logs}/ensure-locking.log">
5656
<Policies>
5757
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
5858
</Policies>
5959
<DefaultRolloverStrategy max="${rollover.max}"/>
60-
<PatternLayout pattern="${exist.file.pattern}"/>
60+
<PatternLayout pattern="%d %-5p - %m %n"/>
6161
</RollingRandomAccessFile>
62-
63-
<RollingRandomAccessFile name="exist.urlrewrite" filePattern="${logs}/urlrewrite.${rollover.file.pattern}.log.gz" fileName="${logs}/urlrewrite.log">
62+
63+
<RollingRandomAccessFile name="elemental.xmldb" filePattern="${logs}/xmldb.${rollover.file.pattern}.log.gz" fileName="${logs}/xmldb.log">
64+
<Policies>
65+
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
66+
</Policies>
67+
<DefaultRolloverStrategy max="${rollover.max}"/>
68+
<PatternLayout pattern="${elemental.file.pattern}"/>
69+
</RollingRandomAccessFile>
70+
71+
<RollingRandomAccessFile name="elemental.xmlrpc" filePattern="${logs}/xmlrpc.${rollover.file.pattern}.log.gz" fileName="${logs}/xmlrpc.log">
6472
<Policies>
6573
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
6674
</Policies>
6775
<DefaultRolloverStrategy max="${rollover.max}"/>
68-
<PatternLayout pattern="${exist.file.pattern}"/>
76+
<PatternLayout pattern="${elemental.file.pattern}"/>
6977
</RollingRandomAccessFile>
7078

71-
<RollingRandomAccessFile name="exist.profiling" filePattern="${logs}/profile.${rollover.file.pattern}.log.gz" fileName="${logs}/profile.log">
79+
<RollingRandomAccessFile name="elemental.urlrewrite" filePattern="${logs}/urlrewrite.${rollover.file.pattern}.log.gz" fileName="${logs}/urlrewrite.log">
7280
<Policies>
7381
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
7482
</Policies>
7583
<DefaultRolloverStrategy max="${rollover.max}"/>
76-
<PatternLayout pattern="${exist.file.pattern}"/>
84+
<PatternLayout pattern="${elemental.file.pattern}"/>
7785
</RollingRandomAccessFile>
7886

79-
<RollingRandomAccessFile name="exist.scheduler" filePattern="${logs}/scheduler.${rollover.file.pattern}.log.gz" fileName="${logs}/scheduler.log">
87+
<RollingRandomAccessFile name="elemental.profiling" filePattern="${logs}/profile.${rollover.file.pattern}.log.gz" fileName="${logs}/profile.log">
8088
<Policies>
8189
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
8290
</Policies>
8391
<DefaultRolloverStrategy max="${rollover.max}"/>
84-
<PatternLayout pattern="${exist.file.pattern}"/>
92+
<PatternLayout pattern="${elemental.file.pattern}"/>
8593
</RollingRandomAccessFile>
8694

87-
<RollingRandomAccessFile name="exist.ehcache" filePattern="${logs}/ehcache.${rollover.file.pattern}.log.gz" fileName="${logs}/ehcache.log">
95+
<RollingRandomAccessFile name="elemental.scheduler" filePattern="${logs}/scheduler.${rollover.file.pattern}.log.gz" fileName="${logs}/scheduler.log">
8896
<Policies>
8997
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
9098
</Policies>
9199
<DefaultRolloverStrategy max="${rollover.max}"/>
92-
<PatternLayout pattern="${exist.file.pattern}"/>
100+
<PatternLayout pattern="${elemental.file.pattern}"/>
93101
</RollingRandomAccessFile>
94102

95-
<RollingRandomAccessFile name="exist.betterform" filePattern="${logs}/betterform.${rollover.file.pattern}.log.gz" fileName="${logs}/betterform.log">
103+
<RollingRandomAccessFile name="elemental.ehcache" filePattern="${logs}/ehcache.${rollover.file.pattern}.log.gz" fileName="${logs}/ehcache.log">
96104
<Policies>
97105
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
98106
</Policies>
99107
<DefaultRolloverStrategy max="${rollover.max}"/>
100-
<PatternLayout pattern="${exist.file.pattern}"/>
108+
<PatternLayout pattern="${elemental.file.pattern}"/>
101109
</RollingRandomAccessFile>
102110

103-
<RollingRandomAccessFile name="exist.restxq" filePattern="${logs}/restxq.${rollover.file.pattern}.log.gz" fileName="${logs}/restxq.log">
111+
<RollingRandomAccessFile name="elemental.restxq" filePattern="${logs}/restxq.${rollover.file.pattern}.log.gz" fileName="${logs}/restxq.log">
104112
<Policies>
105113
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
106114
</Policies>
107115
<DefaultRolloverStrategy max="${rollover.max}"/>
108-
<PatternLayout pattern="${exist.file.pattern}"/>
116+
<PatternLayout pattern="${elemental.file.pattern}"/>
109117
</RollingRandomAccessFile>
110118

111119
<RollingRandomAccessFile name="jetty.request" filePattern="${logs}/request.${rollover.daily.file.pattern}.log.gz" fileName="${logs}/request.log">
@@ -116,134 +124,129 @@
116124
<PatternLayout pattern="${request.file.pattern}"/>
117125
</RollingRandomAccessFile>
118126

119-
<RollingRandomAccessFile name="exist.backup" filePattern="${logs}/backup.${rollover.file.pattern}.log.gz" fileName="${logs}/backup.log">
120-
<Policies>
121-
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
122-
</Policies>
123-
<DefaultRolloverStrategy max="${rollover.max}"/>
124-
<PatternLayout pattern="${exist.file.pattern}"/>
125-
</RollingRandomAccessFile>
126-
127-
<RollingRandomAccessFile name="exist.mdStorage" filePattern="${logs}/mdStorage.${rollover.file.pattern}.log.gz" fileName="${logs}/mdStorage.log">
127+
<RollingRandomAccessFile name="elemental.backup" filePattern="${logs}/backup.${rollover.file.pattern}.log.gz" fileName="${logs}/backup.log">
128128
<Policies>
129129
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
130130
</Policies>
131131
<DefaultRolloverStrategy max="${rollover.max}"/>
132-
<PatternLayout pattern="${exist.file.pattern}"/>
132+
<PatternLayout pattern="${elemental.file.pattern}"/>
133133
</RollingRandomAccessFile>
134134

135-
<RollingRandomAccessFile name="exist.statistics" filePattern="${logs}/statistics.${rollover.file.pattern}.log.gz" fileName="${logs}/statistics.log">
135+
<RollingRandomAccessFile name="elemental.statistics" filePattern="${logs}/statistics.${rollover.file.pattern}.log.gz" fileName="${logs}/statistics.log">
136136
<Policies>
137137
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
138138
</Policies>
139139
<DefaultRolloverStrategy max="${rollover.max}"/>
140-
<PatternLayout pattern="${exist.file.pattern}"/>
140+
<PatternLayout pattern="${elemental.file.pattern}"/>
141141
</RollingRandomAccessFile>
142142

143143
<RollingRandomAccessFile name="expath.repo" filePattern="${logs}/expath-repo.${rollover.file.pattern}.log.gz" fileName="${logs}/expath-repo.log">
144144
<Policies>
145145
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
146146
</Policies>
147147
<DefaultRolloverStrategy max="${rollover.max}"/>
148-
<PatternLayout pattern="${exist.file.pattern}"/>
148+
<PatternLayout pattern="${elemental.file.pattern}"/>
149149
</RollingRandomAccessFile>
150150

151-
<RollingRandomAccessFile name="exist.launcher" filePattern="${logs}/launcher.${rollover.file.pattern}.log.gz" fileName="${logs}/launcher.log">
151+
<RollingRandomAccessFile name="elemental.launcher" filePattern="${logs}/launcher.${rollover.file.pattern}.log.gz" fileName="${logs}/launcher.log">
152152
<Policies>
153153
<SizeBasedTriggeringPolicy size="${rollover.max.size}"/>
154154
</Policies>
155155
<DefaultRolloverStrategy max="${rollover.max}"/>
156-
<PatternLayout pattern="${exist.file.pattern}"/>
156+
<PatternLayout pattern="${elemental.file.pattern}"/>
157157
</RollingRandomAccessFile>
158158

159159
</Appenders>
160160

161161
<Loggers>
162162

163+
<Logger name="org.exist.storage.lock.LockTable" additivity="false" level="info"> <!-- set to level="trace" to see lock activity -->
164+
<AppenderRef ref="elemental.locks"/>
165+
</Logger>
166+
167+
<Logger name="org.exist.storage.lock.EnsureLockingAspect" additivity="false" level="trace">
168+
<AppenderRef ref="elemental.ensurelocking"/>
169+
</Logger>
170+
163171
<Logger name="org.exist.util.sanity.SanityCheck" additivity="false" level="info"> <!-- set to level="trace" to enable all sanity check logging -->
164-
<AppenderRef ref="exist.core"/>
172+
<AppenderRef ref="elemental.core"/>
165173
</Logger>
166174

167175
<Logger name="org.exist.jetty.JettyStart" additivity="false" level="warn">
168-
<AppenderRef ref="exist.core"/>
176+
<AppenderRef ref="elemental.core"/>
169177
</Logger>
170178

171179
<Logger name="org.exist.jetty.StandaloneServer" additivity="false" level="warn">
172-
<AppenderRef ref="exist.core"/>
180+
<AppenderRef ref="elemental.core"/>
173181
</Logger>
174182

175183
<Logger name="xquery.profiling" additivity="false" level="trace">
176-
<AppenderRef ref="exist.profiling"/>
184+
<AppenderRef ref="elemental.profiling"/>
177185
</Logger>
178186

179187
<Logger name="org.exist.statistics" additivity="false" level="debug">
180-
<AppenderRef ref="exist.core"/>
181-
<AppenderRef ref="exist.statistics"/>
188+
<AppenderRef ref="elemental.core"/>
189+
<AppenderRef ref="elemental.statistics"/>
182190
</Logger>
183191

184192
<Logger name="org.exist.backup.SystemExport" additivity="false" level="trace">
185-
<AppenderRef ref="exist.backup"/>
193+
<AppenderRef ref="elemental.backup"/>
186194
</Logger>
187195

188196
<Logger name="org.exist.xmldb" additivity="false" level="info">
189-
<AppenderRef ref="exist.xmldb"/>
197+
<AppenderRef ref="elemental.xmldb"/>
190198
</Logger>
191199

192200
<Logger name="org.exist.xmlrpc" additivity="false" level="info">
193-
<AppenderRef ref="exist.xmlrpc"/>
201+
<AppenderRef ref="elemental.xmlrpc"/>
194202
</Logger>
195203

196204
<Logger name="org.apache.xmlrpc" additivity="false" level="info">
197-
<AppenderRef ref="exist.xmlrpc"/>
205+
<AppenderRef ref="elemental.xmlrpc"/>
198206
</Logger>
199207

200208
<Logger name="org.exist.http.urlrewrite" additivity="false" level="info">
201209
<!-- set to "trace" to get detailed info on URL rewriting -->
202-
<AppenderRef ref="exist.urlrewrite"/>
210+
<AppenderRef ref="elemental.urlrewrite"/>
203211
</Logger>
204212

205213
<Logger name="org.exist.extensions.exquery.restxq" additivity="false" level="info">
206-
<AppenderRef ref="exist.restxq"/>
214+
<AppenderRef ref="elemental.restxq"/>
207215
</Logger>
208216

209217
<Logger name="org.eclipse.jetty.server.RequestLog" additivity="false" level="info">
210218
<AppenderRef ref="jetty.request"/>
211219
</Logger>
212220

213221
<Logger name="org.eclipse.jetty" additivity="false" level="info">
214-
<AppenderRef ref="exist.core"/>
222+
<AppenderRef ref="elemental.core"/>
215223
</Logger>
216224

217225
<Logger name="httpclient" additivity="false" level="info">
218-
<AppenderRef ref="exist.core"/>
226+
<AppenderRef ref="elemental.core"/>
219227
</Logger>
220228

221229
<Logger name="net.sf.ehcache" additivity="false" level="info">
222-
<AppenderRef ref="exist.ehcache"/>
230+
<AppenderRef ref="elemental.ehcache"/>
223231
</Logger>
224232

225233
<!-- Milton WebDAV framework -->
226234
<Logger name="com.bradmcevoy" additivity="false" level="info">
227-
<AppenderRef ref="exist.core"/>
235+
<AppenderRef ref="elemental.core"/>
236+
</Logger>
237+
238+
<!-- Apache Axis: 'debug' produces a large amount of debugging output -->
239+
<Logger name="org.apache" additivity="false" level="off">
240+
<AppenderRef ref="elemental.core"/>
228241
</Logger>
229242

230243
<!-- Quartz scheduler -->
231244
<Logger name="org.quartz" additivity="false" level="info">
232-
<AppenderRef ref="exist.scheduler"/>
245+
<AppenderRef ref="elemental.scheduler"/>
233246
</Logger>
234247

235248
<Logger name="org.exist.storage.SystemTask" additivity="false" level="debug">
236-
<AppenderRef ref="exist.scheduler"/>
237-
</Logger>
238-
239-
<!-- betterFORM extension -->
240-
<Logger name="de.betterform" additivity="false" level="warn">
241-
<AppenderRef ref="exist.betterform"/>
242-
</Logger>
243-
244-
<!-- Metadata Storage extension -->
245-
<Logger name="mdStorage" additivity="false" level="warn">
246-
<AppenderRef ref="exist.mdStorage"/>
249+
<AppenderRef ref="elemental.scheduler"/>
247250
</Logger>
248251

249252
<!-- expath pkg repo -->
@@ -254,11 +257,11 @@
254257
<AppenderRef ref="expath.repo"/>
255258
</Logger>
256259
<Logger name="org.exist.launcher" additivity="false" level="warn">
257-
<AppenderRef ref="exist.launcher"/>
260+
<AppenderRef ref="elemental.launcher"/>
258261
</Logger>
259262

260263
<Root level="info">
261-
<AppenderRef ref="exist.core"></AppenderRef>
264+
<AppenderRef ref="elemental.core"></AppenderRef>
262265
</Root>
263266

264267
</Loggers>

0 commit comments

Comments
 (0)