You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2019/04/24 17:53:21 UTC
[lucene-solr] branch master updated: SOLR-13268: Clean up any test
failures resulting from defaulting to async logging
This is an automated email from the ASF dual-hosted git repository.
erick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new 48dc020 SOLR-13268: Clean up any test failures resulting from defaulting to async logging
48dc020 is described below
commit 48dc020ddaf0b0911012b4d9b77d859b2af3d3ae
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Wed Apr 24 09:23:11 2019 -0700
SOLR-13268: Clean up any test failures resulting from defaulting to async logging
---
solr/core/src/test-files/log4j2.xml | 2 +-
solr/solrj/src/test-files/log4j2.xml | 47 +++++++++++++++++++++++++++++-------
2 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/solr/core/src/test-files/log4j2.xml b/solr/core/src/test-files/log4j2.xml
index e3c2a3b..bec2052 100644
--- a/solr/core/src/test-files/log4j2.xml
+++ b/solr/core/src/test-files/log4j2.xml
@@ -32,7 +32,7 @@
<AsyncLogger name="org.apache.hadoop" level="WARN"/>
<AsyncLogger name="org.apache.directory" level="WARN"/>
<AsyncLogger name="org.apache.solr.hadoop" level="INFO"/>
- <Logger name="org.eclipse.jetty" level="INFO"/>
+ <AsyncLogger name="org.eclipse.jetty" level="INFO"/>
<AsyncRoot level="INFO">
<AppenderRef ref="STDERR"/>
diff --git a/solr/solrj/src/test-files/log4j2.xml b/solr/solrj/src/test-files/log4j2.xml
index 612cfe8..d5cf8b5 100644
--- a/solr/solrj/src/test-files/log4j2.xml
+++ b/solr/solrj/src/test-files/log4j2.xml
@@ -15,26 +15,55 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+<!-- Configuration for asynchronous logging -->
<Configuration>
<Appenders>
<Console name="STDERR" target="SYSTEM_ERR">
<PatternLayout>
<Pattern>
- %-4r %-5p (%t) [%X{node_name} %X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n
+ %maxLen{%-4r %-5p (%t) [%X{node_name} %X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%notEmpty{
+ =>%ex{short}}}{10240}%n
</Pattern>
</PatternLayout>
</Console>
</Appenders>
<Loggers>
- <Logger name="org.apache.zookeeper" level="WARN"/>
- <Logger name="org.apache.hadoop" level="WARN"/>
- <Logger name="org.apache.directory" level="WARN"/>
- <Logger name="org.apache.solr.hadoop" level="INFO"/>
- <Logger name="org.eclipse.jetty" level="INFO"/>
+ <AsyncLogger name="org.apache.zookeeper" level="WARN"/>
+ <AsyncLogger name="org.apache.hadoop" level="WARN"/>
+ <AsyncLogger name="org.apache.directory" level="WARN"/>
+ <AsyncLogger name="org.apache.solr.hadoop" level="INFO"/>
+ <AsyncLogger name="org.eclipse.jetty" level="INFO"/>
- <Root level="INFO">
+ <AsyncRoot level="INFO">
<AppenderRef ref="STDERR"/>
- </Root>
+ </AsyncRoot>
</Loggers>
</Configuration>
+
+ <!-- Configuration for synchronous logging
+ there _may_ be a very small window where log messages will not be flushed
+ to the log file on abnormal shutdown. If even this risk is unacceptable, use
+ the configuration below
+ -->
+ <!--Configuration>
+ <Appenders>
+ <Console name="STDERR" target="SYSTEM_ERR">
+ <PatternLayout>
+ <Pattern>
+ %-4r %-5p (%t) [%X{node_name} %X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n
+ </Pattern>
+ </PatternLayout>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.zookeeper" level="WARN"/>
+ <Logger name="org.apache.hadoop" level="WARN"/>
+ <Logger name="org.apache.directory" level="WARN"/>
+ <Logger name="org.apache.solr.hadoop" level="INFO"/>
+ <Logger name="org.eclipse.jetty" level="INFO"/>
+
+ <Root level="INFO">
+ <AppenderRef ref="STDERR"/>
+ </Root>
+ </Loggers>
+ </Configuration-->