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 E6869200C02 for ; Thu, 5 Jan 2017 10:23:35 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E523E160B61; Thu, 5 Jan 2017 09:23:35 +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 1A0CD160B27 for ; Thu, 5 Jan 2017 10:23:34 +0100 (CET) Received: (qmail 60832 invoked by uid 500); 5 Jan 2017 09:23:34 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 60775 invoked by uid 99); 5 Jan 2017 09:23:34 -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, 05 Jan 2017 09:23:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2CE62DFC2F; Thu, 5 Jan 2017 09:23:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Thu, 05 Jan 2017 09:23:35 -0000 Message-Id: In-Reply-To: <3128adad3ae64e69b405c9e4a0697c83@git.apache.org> References: <3128adad3ae64e69b405c9e4a0697c83@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/37] ignite git commit: IGNITE-4248: Fixed: Some loggers ignore IGNITE_QUIET system property. This closes #1367. archived-at: Thu, 05 Jan 2017 09:23:36 -0000 IGNITE-4248: Fixed: Some loggers ignore IGNITE_QUIET system property. This closes #1367. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c103ac33 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c103ac33 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c103ac33 Branch: refs/heads/ignite-2.0 Commit: c103ac33d590492577bb687b29969550cdb532cf Parents: 83d961c Author: Andrey V. Mashenkov Authored: Wed Dec 21 16:53:18 2016 +0300 Committer: Andrey V. Mashenkov Committed: Wed Dec 21 16:53:18 2016 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/IgniteLogger.java | 4 ++-- .../processors/hadoop/impl/igfs/HadoopIgfsJclLogger.java | 9 ++++++++- .../java/org/apache/ignite/logger/jcl/JclLogger.java | 9 ++++++++- .../java/org/apache/ignite/logger/slf4j/Slf4jLogger.java | 11 +++++++++-- 4 files changed, 27 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c103ac33/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java index f3afa99..8d814fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java @@ -146,9 +146,9 @@ public interface IgniteLogger { public boolean isInfoEnabled(); /** - * Tests whether {@code info} and {@code debug} levels are turned off. + * Tests whether Logger is in "Quiet mode". * - * @return Whether {@code info} and {@code debug} levels are turned off. + * @return {@code true} "Quiet mode" is enabled, {@code false} otherwise */ public boolean isQuiet(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c103ac33/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsJclLogger.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsJclLogger.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsJclLogger.java index 0ae8a9f..6475204 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsJclLogger.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsJclLogger.java @@ -24,6 +24,8 @@ import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.Nullable; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_QUIET; + /** * JCL logger wrapper for Hadoop. */ @@ -32,6 +34,9 @@ public class HadoopIgfsJclLogger implements IgniteLogger { @GridToStringInclude private Log impl; + /** Quiet flag. */ + private final boolean quiet; + /** * Constructor. * @@ -41,6 +46,8 @@ public class HadoopIgfsJclLogger implements IgniteLogger { assert impl != null; this.impl = impl; + + quiet = Boolean.valueOf(System.getProperty(IGNITE_QUIET, "true")); } /** {@inheritDoc} */ @@ -81,7 +88,7 @@ public class HadoopIgfsJclLogger implements IgniteLogger { /** {@inheritDoc} */ @Override public boolean isQuiet() { - return !isInfoEnabled() && !isDebugEnabled(); + return quiet; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/c103ac33/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/JclLogger.java ---------------------------------------------------------------------- diff --git a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/JclLogger.java b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/JclLogger.java index a13caa1..c75197a 100644 --- a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/JclLogger.java +++ b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/JclLogger.java @@ -22,6 +22,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.ignite.IgniteLogger; import org.jetbrains.annotations.Nullable; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_QUIET; + /** * This logger wraps any JCL (Jakarta Commons Logging) * loggers. Implementation simply delegates to underlying JCL logger. This logger @@ -77,6 +79,9 @@ public class JclLogger implements IgniteLogger { /** JCL implementation proxy. */ private Log impl; + /** Quiet flag. */ + private final boolean quiet; + /** * Creates new logger. */ @@ -93,6 +98,8 @@ public class JclLogger implements IgniteLogger { assert impl != null; this.impl = impl; + + quiet = Boolean.valueOf(System.getProperty(IGNITE_QUIET, "true")); } /** {@inheritDoc} */ @@ -133,7 +140,7 @@ public class JclLogger implements IgniteLogger { /** {@inheritDoc} */ @Override public boolean isQuiet() { - return !isInfoEnabled() && !isDebugEnabled(); + return quiet; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/c103ac33/modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/Slf4jLogger.java ---------------------------------------------------------------------- diff --git a/modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/Slf4jLogger.java b/modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/Slf4jLogger.java index 51e5669..2b0e980 100644 --- a/modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/Slf4jLogger.java +++ b/modules/slf4j/src/main/java/org/apache/ignite/logger/slf4j/Slf4jLogger.java @@ -22,6 +22,8 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_QUIET; + /** * SLF4J-based implementation for logging. This logger should be used * by loaders that have prefer slf4j-based logging. @@ -41,11 +43,14 @@ public class Slf4jLogger implements IgniteLogger { /** SLF4J implementation proxy. */ private final Logger impl; + /** Quiet flag. */ + private final boolean quiet; + /** * Creates new logger. */ public Slf4jLogger() { - impl = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); + this(LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME)); } /** @@ -57,6 +62,8 @@ public class Slf4jLogger implements IgniteLogger { assert impl != null; this.impl = impl; + + quiet = Boolean.valueOf(System.getProperty(IGNITE_QUIET, "true")); } /** {@inheritDoc} */ @@ -129,7 +136,7 @@ public class Slf4jLogger implements IgniteLogger { /** {@inheritDoc} */ @Override public boolean isQuiet() { - return !isInfoEnabled() && !isDebugEnabled(); + return quiet; } /** {@inheritDoc} */