Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-18133: Remove error-truncation in log4j2.xml (#4163)

Jason Gerlowski9ef8d0ee47d1
diff --git a/solr/benchmark/src/test-files/log4j2.xml b/solr/benchmark/src/test-files/log4j2.xml
index 983559c47c8..5e887a6ce7b 100644
--- a/solr/benchmark/src/test-files/log4j2.xml
+++ b/solr/benchmark/src/test-files/log4j2.xml
@@ -24,7 +24,7 @@
<PatternLayout>
<Pattern>
%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.}
- %m%notEmpty{ =>%ex{short}}}{10240}%n
+ %m}{10240}%n
</Pattern>
</PatternLayout>
</Console>
@@ -36,7 +36,7 @@
<PatternLayout>
<Pattern>
%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.}
- %m%notEmpty{ =>%ex{short}}}{10240}%n
+ %m}{10240}%n
</Pattern>
</PatternLayout>
<Policies>
@@ -53,7 +53,7 @@
<PatternLayout>
<Pattern>
%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.}
- %m%notEmpty{ =>%ex{short}}}{10240}%n
+ %m}{10240}%n
</Pattern>
</PatternLayout>
<Policies>
@@ -69,7 +69,7 @@
<PatternLayout>
<Pattern>
%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.}
- %m%notEmpty{ =>%ex{short}}}{10240}%n
+ %m}{10240}%n
</Pattern>
</PatternLayout>
</RandomAccessFile>
diff --git a/solr/core/src/test-files/log4j2.xml b/solr/core/src/test-files/log4j2.xml
index 9078571bce0..3e941d535da 100644
--- a/solr/core/src/test-files/log4j2.xml
+++ b/solr/core/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/cross-dc-manager/conf/log4j2.xml b/solr/cross-dc-manager/conf/log4j2.xml
index 528299e3e0b..7dbc3449904 100644
--- a/solr/cross-dc-manager/conf/log4j2.xml
+++ b/solr/cross-dc-manager/conf/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/cross-dc-manager/src/test-files/log4j2.xml b/solr/cross-dc-manager/src/test-files/log4j2.xml
index 0f12a41ea10..a19cfd9c720 100644
--- a/solr/cross-dc-manager/src/test-files/log4j2.xml
+++ b/solr/cross-dc-manager/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/modules/analysis-extras/src/test-files/log4j2.xml b/solr/modules/analysis-extras/src/test-files/log4j2.xml
index 528299e3e0b..7dbc3449904 100644
--- a/solr/modules/analysis-extras/src/test-files/log4j2.xml
+++ b/solr/modules/analysis-extras/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/modules/clustering/src/test-files/log4j2.xml b/solr/modules/clustering/src/test-files/log4j2.xml
index f668c06a1ed..04f900d2b62 100644
--- a/solr/modules/clustering/src/test-files/log4j2.xml
+++ b/solr/modules/clustering/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/modules/cross-dc/src/test-files/log4j2.xml b/solr/modules/cross-dc/src/test-files/log4j2.xml
index 6ba5e7c96aa..e4a69202836 100644
--- a/solr/modules/cross-dc/src/test-files/log4j2.xml
+++ b/solr/modules/cross-dc/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/modules/cuvs/src/test-files/log4j2.xml b/solr/modules/cuvs/src/test-files/log4j2.xml
index 528299e3e0b..7dbc3449904 100644
--- a/solr/modules/cuvs/src/test-files/log4j2.xml
+++ b/solr/modules/cuvs/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/modules/extraction/src/test-files/log4j2.xml b/solr/modules/extraction/src/test-files/log4j2.xml
index 528299e3e0b..7dbc3449904 100644
--- a/solr/modules/extraction/src/test-files/log4j2.xml
+++ b/solr/modules/extraction/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/modules/gcs-repository/src/test-files/log4j2.xml b/solr/modules/gcs-repository/src/test-files/log4j2.xml
index 528299e3e0b..7dbc3449904 100644
--- a/solr/modules/gcs-repository/src/test-files/log4j2.xml
+++ b/solr/modules/gcs-repository/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/modules/jwt-auth/src/test-files/log4j2.xml b/solr/modules/jwt-auth/src/test-files/log4j2.xml
index 528299e3e0b..7dbc3449904 100644
--- a/solr/modules/jwt-auth/src/test-files/log4j2.xml
+++ b/solr/modules/jwt-auth/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/modules/langid/src/test-files/log4j2.xml b/solr/modules/langid/src/test-files/log4j2.xml
index 528299e3e0b..7dbc3449904 100644
--- a/solr/modules/langid/src/test-files/log4j2.xml
+++ b/solr/modules/langid/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/modules/language-models/src/test-files/log4j2.xml b/solr/modules/language-models/src/test-files/log4j2.xml
index f668c06a1ed..04f900d2b62 100644
--- a/solr/modules/language-models/src/test-files/log4j2.xml
+++ b/solr/modules/language-models/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/modules/ltr/src/test-files/log4j2.xml b/solr/modules/ltr/src/test-files/log4j2.xml
index 528299e3e0b..7dbc3449904 100644
--- a/solr/modules/ltr/src/test-files/log4j2.xml
+++ b/solr/modules/ltr/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/modules/opentelemetry/src/test-files/log4j2.xml b/solr/modules/opentelemetry/src/test-files/log4j2.xml
index 528299e3e0b..7dbc3449904 100644
--- a/solr/modules/opentelemetry/src/test-files/log4j2.xml
+++ b/solr/modules/opentelemetry/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/modules/s3-repository/src/test-files/log4j2.xml b/solr/modules/s3-repository/src/test-files/log4j2.xml
index 528299e3e0b..7dbc3449904 100644
--- a/solr/modules/s3-repository/src/test-files/log4j2.xml
+++ b/solr/modules/s3-repository/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/modules/scripting/src/test-files/log4j2.xml b/solr/modules/scripting/src/test-files/log4j2.xml
index 528299e3e0b..7dbc3449904 100644
--- a/solr/modules/scripting/src/test-files/log4j2.xml
+++ b/solr/modules/scripting/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/modules/sql/src/test-files/log4j2.xml b/solr/modules/sql/src/test-files/log4j2.xml
index 689aa9605da..128518538c7 100644
--- a/solr/modules/sql/src/test-files/log4j2.xml
+++ b/solr/modules/sql/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/server/resources/log4j2.xml b/solr/server/resources/log4j2.xml
index 1d70770b73a..8604e080428 100644
--- a/solr/server/resources/log4j2.xml
+++ b/solr/server/resources/log4j2.xml
@@ -23,7 +23,7 @@
<Console name="STDOUT" target="SYSTEM_OUT">
<PatternLayout>
<Pattern>
- %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}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
+ %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}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m}{10240}%n
</Pattern>
</PatternLayout>
</Console>
@@ -34,7 +34,7 @@
filePattern="${sys:solr.logs.dir}/solr.log.%i" >
<PatternLayout>
<Pattern>
- %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}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
+ %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}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m}{10240}%n
</Pattern>
</PatternLayout>
<Policies>
@@ -50,7 +50,7 @@
filePattern="${sys:solr.logs.dir}/solr_slow_requests.log.%i" >
<PatternLayout>
<Pattern>
- %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}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
+ %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}}%notEmpty{ t:%X{trace_id}}] %c{1.} %m}{10240}%n
</Pattern>
</PatternLayout>
<Policies>
diff --git a/solr/solrj-streaming/src/test-files/log4j2.xml b/solr/solrj-streaming/src/test-files/log4j2.xml
index 528299e3e0b..7dbc3449904 100644
--- a/solr/solrj-streaming/src/test-files/log4j2.xml
+++ b/solr/solrj-streaming/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>
diff --git a/solr/solrj/src/test-files/log4j2.xml b/solr/solrj/src/test-files/log4j2.xml
index 528299e3e0b..7dbc3449904 100644
--- a/solr/solrj/src/test-files/log4j2.xml
+++ b/solr/solrj/src/test-files/log4j2.xml
@@ -21,8 +21,7 @@
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %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{
- =>%ex{short}}}{10240}%n
+ %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
</Pattern>
</PatternLayout>
</Console>