Skip to content

Commit 9ef8d0e

Browse files
gerlowskijagerlowskija
authored
SOLR-18133: Remove error-truncation in log4j2.xml (#4163)
1 parent 37a0869 commit 9ef8d0e

21 files changed

Lines changed: 26 additions & 45 deletions

File tree

‎solr/benchmark/src/test-files/log4j2.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<PatternLayout>
2525
<Pattern>
2626
%maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.}
27-
%m%notEmpty{ =>%ex{short}}}{10240}%n
27+
%m}{10240}%n
2828
</Pattern>
2929
</PatternLayout>
3030
</Console>
@@ -36,7 +36,7 @@
3636
<PatternLayout>
3737
<Pattern>
3838
%maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.}
39-
%m%notEmpty{ =>%ex{short}}}{10240}%n
39+
%m}{10240}%n
4040
</Pattern>
4141
</PatternLayout>
4242
<Policies>
@@ -53,7 +53,7 @@
5353
<PatternLayout>
5454
<Pattern>
5555
%maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.}
56-
%m%notEmpty{ =>%ex{short}}}{10240}%n
56+
%m}{10240}%n
5757
</Pattern>
5858
</PatternLayout>
5959
<Policies>
@@ -69,7 +69,7 @@
6969
<PatternLayout>
7070
<Pattern>
7171
%maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.}
72-
%m%notEmpty{ =>%ex{short}}}{10240}%n
72+
%m}{10240}%n
7373
</Pattern>
7474
</PatternLayout>
7575
</RandomAccessFile>

‎solr/core/src/test-files/log4j2.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
<Console name="STDERR" target="SYSTEM_ERR">
2222
<PatternLayout>
2323
<Pattern>
24-
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{
25-
=>%ex{short}}}{10240}%n
24+
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m}{10240}%n
2625
</Pattern>
2726
</PatternLayout>
2827
</Console>

‎solr/cross-dc-manager/conf/log4j2.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
<Console name="STDERR" target="SYSTEM_ERR">
2222
<PatternLayout>
2323
<Pattern>
24-
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{
25-
=>%ex{short}}}{10240}%n
24+
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m}{10240}%n
2625
</Pattern>
2726
</PatternLayout>
2827
</Console>

‎solr/cross-dc-manager/src/test-files/log4j2.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
<Console name="STDERR" target="SYSTEM_ERR">
2222
<PatternLayout>
2323
<Pattern>
24-
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{
25-
=>%ex{short}}}{10240}%n
24+
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m}{10240}%n
2625
</Pattern>
2726
</PatternLayout>
2827
</Console>

‎solr/modules/analysis-extras/src/test-files/log4j2.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
<Console name="STDERR" target="SYSTEM_ERR">
2222
<PatternLayout>
2323
<Pattern>
24-
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{
25-
=>%ex{short}}}{10240}%n
24+
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m}{10240}%n
2625
</Pattern>
2726
</PatternLayout>
2827
</Console>

‎solr/modules/clustering/src/test-files/log4j2.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
<Console name="STDERR" target="SYSTEM_ERR">
2222
<PatternLayout>
2323
<Pattern>
24-
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{
25-
=>%ex{short}}}{10240}%n
24+
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m}{10240}%n
2625
</Pattern>
2726
</PatternLayout>
2827
</Console>

‎solr/modules/cross-dc/src/test-files/log4j2.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
<Console name="STDERR" target="SYSTEM_ERR">
2222
<PatternLayout>
2323
<Pattern>
24-
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{
25-
=>%ex{short}}}{10240}%n
24+
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m}{10240}%n
2625
</Pattern>
2726
</PatternLayout>
2827
</Console>

‎solr/modules/cuvs/src/test-files/log4j2.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
<Console name="STDERR" target="SYSTEM_ERR">
2222
<PatternLayout>
2323
<Pattern>
24-
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{
25-
=>%ex{short}}}{10240}%n
24+
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m}{10240}%n
2625
</Pattern>
2726
</PatternLayout>
2827
</Console>

‎solr/modules/extraction/src/test-files/log4j2.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
<Console name="STDERR" target="SYSTEM_ERR">
2222
<PatternLayout>
2323
<Pattern>
24-
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{
25-
=>%ex{short}}}{10240}%n
24+
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m}{10240}%n
2625
</Pattern>
2726
</PatternLayout>
2827
</Console>

‎solr/modules/gcs-repository/src/test-files/log4j2.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
<Console name="STDERR" target="SYSTEM_ERR">
2222
<PatternLayout>
2323
<Pattern>
24-
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{
25-
=>%ex{short}}}{10240}%n
24+
%maxLen{%-4r %-5p (%t) [%notEmpty{n:%X{node_name}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m}{10240}%n
2625
</Pattern>
2726
</PatternLayout>
2827
</Console>

0 commit comments

Comments
 (0)