From commits-return-116342-archive-asf-public=cust-asf.ponee.io@ignite.apache.org Fri Jan 12 11:02:57 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 961A1180792 for ; Fri, 12 Jan 2018 11:02:56 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 86530160C46; Fri, 12 Jan 2018 10:02:56 +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 96017160C4B for ; Fri, 12 Jan 2018 11:02:55 +0100 (CET) Received: (qmail 94358 invoked by uid 500); 12 Jan 2018 10:02:54 -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 94213 invoked by uid 99); 12 Jan 2018 10:02:54 -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; Fri, 12 Jan 2018 10:02:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B4F85E0779; Fri, 12 Jan 2018 10:02:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Fri, 12 Jan 2018 10:03:05 -0000 Message-Id: <995aadef108a459ea364e6e4909260ad@git.apache.org> In-Reply-To: <45f0d56cab0148c5bd638b4c91067e15@git.apache.org> References: <45f0d56cab0148c5bd638b4c91067e15@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/18] ignite git commit: IGNITE-7295 Fixed GridClient logging. IGNITE-7295 Fixed GridClient logging. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0252e90d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0252e90d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0252e90d Branch: refs/heads/ignite-zk Commit: 0252e90daa265f40f8ba6e87769b4f2598a180fa Parents: 2e669ac Author: Alexey Kuznetsov Authored: Fri Jan 12 11:26:13 2018 +0700 Committer: Alexey Kuznetsov Committed: Fri Jan 12 11:26:13 2018 +0700 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 6 +++++ .../internal/client/impl/GridClientImpl.java | 23 +++++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0252e90d/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java index ad4835a..7ffc13d 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java @@ -25,6 +25,7 @@ import java.util.Properties; import javax.net.ssl.HostnameVerifier; import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.configuration.DataStorageConfiguration; +import org.apache.ignite.internal.client.GridClient; import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.lang.IgnitePredicate; import org.jetbrains.annotations.Nullable; @@ -772,6 +773,11 @@ public final class IgniteSystemProperties { public static final String IGNITE_DATA_STORAGE_FOLDER_BY_CONSISTENT_ID = "IGNITE_DATA_STORAGE_FOLDER_BY_CONSISTENT_ID"; /** + * If this property is set to {@code true} enable logging in {@link GridClient}. + */ + public static final String IGNITE_GRID_CLIENT_LOG_ENABLED = "IGNITE_GRID_CLIENT_LOG_ENABLED"; + + /** * Enforces singleton. */ private IgniteSystemProperties() { http://git-wip-us.apache.org/repos/asf/ignite/blob/0252e90d/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java index 19199c1..9b71ae4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java @@ -36,6 +36,7 @@ import java.util.logging.Logger; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLException; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.internal.client.GridClient; import org.apache.ignite.internal.client.GridClientCacheMode; import org.apache.ignite.internal.client.GridClientClosedException; @@ -79,18 +80,20 @@ public class GridClientImpl implements GridClient { /** Logger. */ private static final Logger log = Logger.getLogger(GridClientImpl.class.getName()); - /** */ + /* Suppression logging if needed. */ static { - boolean isLog4jUsed = U.gridClassLoader().getResource("org/apache/log4j/Appender.class") != null; + if (!IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_GRID_CLIENT_LOG_ENABLED, false)) { + boolean isLog4jUsed = U.gridClassLoader().getResource("org/apache/log4j/Appender.class") != null; + + try { + if (isLog4jUsed) + U.addLog4jNoOpLogger(); - try { - if (isLog4jUsed) - U.addLog4jNoOpLogger(); - else U.addJavaNoOpLogger(); - } - catch (IgniteCheckedException ignored) { - // Our log4j warning suppression failed, leave it as is. + } + catch (IgniteCheckedException ignored) { + // If log warning suppression failed, leave it as is. + } } } @@ -563,4 +566,4 @@ public class GridClientImpl implements GridClient { @Override public String toString() { return "GridClientImpl [id=" + id + ", closed=" + closed + ']'; } -} \ No newline at end of file +}