Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 85B94200B9A for ; Thu, 22 Sep 2016 09:52:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8460C160AE8; Thu, 22 Sep 2016 07:52:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C8C16160AE4 for ; Thu, 22 Sep 2016 09:52:11 +0200 (CEST) Received: (qmail 25361 invoked by uid 500); 22 Sep 2016 07:52:10 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 24873 invoked by uid 99); 22 Sep 2016 07:52:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Sep 2016 07:52:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E6E13E7E30; Thu, 22 Sep 2016 07:52:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dweiss@apache.org To: commits@lucene.apache.org Date: Thu, 22 Sep 2016 07:52:15 -0000 Message-Id: <7a7de3134e344027985ea7a7cdfdc430@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/12] lucene-solr:branch_6x: SOLR-8186: suppress log4j access warnings. archived-at: Thu, 22 Sep 2016 07:52:12 -0000 SOLR-8186: suppress log4j access warnings. Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0a24afdc Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0a24afdc Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0a24afdc Branch: refs/heads/branch_6x Commit: 0a24afdc5b51fb0275a168ee502555bf06d91ff5 Parents: 8984e73 Author: Dawid Weiss Authored: Thu Sep 22 09:33:11 2016 +0200 Committer: Dawid Weiss Committed: Thu Sep 22 09:51:22 2016 +0200 ---------------------------------------------------------------------- .../apache/solr/servlet/SolrDispatchFilter.java | 22 +++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0a24afdc/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java index 53998fa..a32a70a 100644 --- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java +++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java @@ -56,6 +56,7 @@ import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.util.ExecutorUtil; +import org.apache.solr.common.util.SuppressForbidden; import org.apache.solr.core.CoreContainer; import org.apache.solr.core.NodeConfig; import org.apache.solr.core.SolrCore; @@ -123,14 +124,7 @@ public class SolrDispatchFilter extends BaseSolrFilter { { String muteConsole = System.getProperty(SOLR_LOG_MUTECONSOLE); if (muteConsole != null && !Arrays.asList("false","0","off","no").contains(muteConsole.toLowerCase(Locale.ROOT))) { - Enumeration appenders = LogManager.getRootLogger().getAllAppenders(); - while (appenders.hasMoreElements()) { - Appender appender = (Appender) appenders.nextElement(); - if (appender instanceof ConsoleAppender) { - log.info("Property solr.log.muteconsole given. Muting ConsoleAppender named " + appender.getName()); - LogManager.getRootLogger().removeAppender(appender); - } - } + muteConsole(); } log.info("SolrDispatchFilter.init(): {}", this.getClass().getClassLoader()); @@ -167,6 +161,18 @@ public class SolrDispatchFilter extends BaseSolrFilter { log.info("SolrDispatchFilter.init() done"); } + @SuppressForbidden(reason = "Legitimate log4j access") + private void muteConsole() { + Enumeration appenders = LogManager.getRootLogger().getAllAppenders(); + while (appenders.hasMoreElements()) { + Appender appender = (Appender) appenders.nextElement(); + if (appender instanceof ConsoleAppender) { + log.info("Property solr.log.muteconsole given. Muting ConsoleAppender named " + appender.getName()); + LogManager.getRootLogger().removeAppender(appender); + } + } + } + /** * Override this to change CoreContainer initialization * @return a CoreContainer to hold this server's cores