You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by el...@apache.org on 2013/05/29 08:45:19 UTC
svn commit: r1487325 - in /lucene/dev/branches/lucene_solr_4_3: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java
Author: elyograg
Date: Wed May 29 06:45:18 2013
New Revision: 1487325
URL: http://svn.apache.org/r1487325
Log:
SOLR-4868: fix inability to set root logger in Log4JWatcher (merge trunk r1487294)
Modified:
lucene/dev/branches/lucene_solr_4_3/ (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_3/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java
Modified: lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt?rev=1487325&r1=1487324&r2=1487325&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt Wed May 29 06:45:18 2013
@@ -83,6 +83,9 @@ Bug Fixes
* SOLR-4842: Fix facet.field local params from affecting other facet.field's.
(ehatcher, hossman)
+* SOLR-4868: Setting the log level for the log4j root category results in
+ adding a new category, the empty string. (Shawn Heisey)
+
Other Changes
----------------------
Modified: lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java?rev=1487325&r1=1487324&r2=1487325&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java (original)
+++ lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java Wed May 29 06:45:18 2013
@@ -68,10 +68,12 @@ public class Log4jWatcher extends LogWat
@Override
public void setLogLevel(String category, String level) {
+ org.apache.log4j.Logger log;
if(LoggerInfo.ROOT_NAME.equals(category)) {
- category = "";
+ log = org.apache.log4j.LogManager.getRootLogger();
+ } else {
+ log = org.apache.log4j.Logger.getLogger(category);
}
- org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(category);
if(level==null||"unset".equals(level)||"null".equals(level)) {
log.setLevel(null);
}