From a79ffdfeee7430bd5f4528797737b89c5909d59f Mon Sep 17 00:00:00 2001 From: Shawn Heisey Date: Wed, 29 May 2013 06:02:17 +0000 Subject: [PATCH] SOLR-4868: fix inability to set root logger in Log4JWatcher git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1487294 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 3 +++ .../java/org/apache/solr/logging/log4j/Log4jWatcher.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 346566fcf06..19f413cfc6a 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -204,6 +204,9 @@ Bug Fixes * SOLR-4734: Leader election fails with an NPE if there is no UpdateLog. (Mark Miller, Alexander Eibner) +* SOLR-4868: Setting the log level for the log4j root category results in + adding a new category, the empty string. (Shawn Heisey) + Other Changes ---------------------- diff --git a/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java b/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java index f7a62948034..e72a87d4000 100644 --- a/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java +++ b/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java @@ -66,10 +66,12 @@ public class Log4jWatcher extends LogWatcher { @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); }