You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/01/12 07:54:21 UTC
[13/16] 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-join
Commit: 0252e90daa265f40f8ba6e87769b4f2598a180fa
Parents: 2e669ac
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Jan 12 11:26:13 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
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
+}