IGNITE-6658 Add a version of Ignite instance to logger category
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b8128e1f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b8128e1f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b8128e1f Branch: refs/heads/ignite-3478-tree Commit: b8128e1f52103a8cf79ca888841903b4f3940656 Parents: 92cbc6b Author: Vyacheslav Daradur <[email protected]> Authored: Thu Oct 19 16:25:34 2017 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Thu Oct 19 16:25:34 2017 +0300 ---------------------------------------------------------------------- .../testframework/junits/IgniteCompatibilityAbstractTest.java | 6 +++--- .../testframework/junits/IgniteCompatibilityNodeRunner.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b8128e1f/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java index 07d63fd..d637d31 100644 --- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java +++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java @@ -46,7 +46,7 @@ public abstract class IgniteCompatibilityAbstractTest extends GridCommonAbstract private static final ClassLoader CLASS_LOADER = IgniteCompatibilityAbstractTest.class.getClassLoader(); /** Using for synchronization of nodes startup in case of starting remote nodes first. */ - public static final String SYNCHRONIZATION_LOG_MESSAGE_PREPARED = "[Compatibility] Node has been started, id="; + public static final String SYNCHRONIZATION_LOG_MESSAGE = "[Compatibility] Node has been started, id="; /** Waiting milliseconds of the join of a node to topology. */ protected static final int NODE_JOIN_TIMEOUT = 30_000; @@ -139,7 +139,7 @@ public abstract class IgniteCompatibilityAbstractTest extends GridCommonAbstract IgniteProcessProxy ignite = new IgniteProcessProxy(cfg, log, locJvmInstance, true) { @Override protected IgniteLogger logger(IgniteLogger log, Object ctgr) { - return ListenedGridTestLog4jLogger.createLogger(ctgr); + return ListenedGridTestLog4jLogger.createLogger(ctgr + "#" + ver.replaceAll("\\.", "_")); } @Override protected String igniteNodeRunnerClassName() throws Exception { @@ -271,7 +271,7 @@ public abstract class IgniteCompatibilityAbstractTest extends GridCommonAbstract */ LoggedJoinNodeClosure(CountDownLatch nodeJoinedLatch, UUID nodeId) { this.nodeJoinedLatch = nodeJoinedLatch; - this.pattern = SYNCHRONIZATION_LOG_MESSAGE_PREPARED + nodeId; + this.pattern = SYNCHRONIZATION_LOG_MESSAGE + nodeId; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b8128e1f/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityNodeRunner.java ---------------------------------------------------------------------- diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityNodeRunner.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityNodeRunner.java index 3256d06..3b5010b 100644 --- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityNodeRunner.java +++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityNodeRunner.java @@ -100,7 +100,7 @@ public class IgniteCompatibilityNodeRunner extends IgniteNodeRunner { clo.apply(ignite); } - X.println(IgniteCompatibilityAbstractTest.SYNCHRONIZATION_LOG_MESSAGE_PREPARED + nodeId); + X.println(IgniteCompatibilityAbstractTest.SYNCHRONIZATION_LOG_MESSAGE + nodeId); } /**
