Repository: incubator-ignite Updated Branches: refs/heads/ignite-788-last-review ef14ffe43 -> d7f5cd047
review Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d7f5cd04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d7f5cd04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d7f5cd04 Branch: refs/heads/ignite-788-last-review Commit: d7f5cd04734ef458e8a1398d83606bb71e36a586 Parents: ef14ffe Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Jul 23 13:32:54 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Jul 23 13:32:54 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/logger/log4j2/Log4J2Logger.java | 3 ++- .../ignite/logger/log4j2/Log4j2LoggerSelfTest.java | 13 +++++-------- .../logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java | 6 +----- 3 files changed, 8 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d7f5cd04/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java ---------------------------------------------------------------------- diff --git a/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java b/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java index 6d5df74..19f43e6 100644 --- a/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java +++ b/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java @@ -302,7 +302,8 @@ public class Log4J2Logger implements IgniteLogger, LoggerNodeIdAware { // User configured console appender, but log is quiet. quiet = false; - if (!consoleAppenderFound && !quiet && Boolean.valueOf(System.getProperty(IGNITE_CONSOLE_APPENDER, "true"))) { + if (!consoleAppenderFound && !quiet && + Boolean.valueOf(System.getProperty(IGNITE_CONSOLE_APPENDER, "true"))) { // Console appender not found => we've looked through all categories up to root. assert rootLogger != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d7f5cd04/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java index 7bfcf78..ac10a64 100644 --- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java +++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java @@ -26,7 +26,6 @@ import org.apache.ignite.logger.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.*; -import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.util.*; @@ -34,7 +33,6 @@ import java.util.*; /** * Grid Log4j2 SPI test. */ -@GridCommonTest(group = "Logger") public class Log4j2LoggerSelfTest extends TestCase { /** */ private static final String LOG_PATH_TEST = "modules/core/src/test/config/log4j2-test.xml"; @@ -53,7 +51,7 @@ public class Log4j2LoggerSelfTest extends TestCase { IgniteLogger log = new Log4J2Logger(xml).getLogger(getClass()); - ((LoggerNodeIdAware) log).setNodeId(UUID.randomUUID()); + ((LoggerNodeIdAware)log).setNodeId(UUID.randomUUID()); checkLog(log); } @@ -69,7 +67,7 @@ public class Log4j2LoggerSelfTest extends TestCase { IgniteLogger log = new Log4J2Logger(xml.toURI().toURL()).getLogger(getClass()); - ((LoggerNodeIdAware) log).setNodeId(UUID.randomUUID()); + ((LoggerNodeIdAware)log).setNodeId(UUID.randomUUID()); checkLog(log); } @@ -80,7 +78,7 @@ public class Log4j2LoggerSelfTest extends TestCase { public void testPathConstructor() throws Exception { IgniteLogger log = new Log4J2Logger(LOG_PATH_TEST).getLogger(getClass()); - ((LoggerNodeIdAware) log).setNodeId(UUID.randomUUID()); + ((LoggerNodeIdAware)log).setNodeId(UUID.randomUUID()); checkLog(log); } @@ -143,6 +141,7 @@ public class Log4j2LoggerSelfTest extends TestCase { assertEquals(logFile.getAbsolutePath(), ignite.log().fileName()); } + String logContent = U.readFileToString(logFile.getAbsolutePath(), "UTF-8"); assertTrue("Log file does not contain it's node ID: " + logFile, @@ -166,12 +165,10 @@ public class Log4j2LoggerSelfTest extends TestCase { setAddresses(Collections.singleton("127.0.0.1:47500..47509")); }}); - IgniteConfiguration cfg = new IgniteConfiguration() + return new IgniteConfiguration() .setGridName(gridName) .setGridLogger(new Log4J2Logger(logPath)) .setConnectorConfiguration(null) .setDiscoverySpi(disco); - - return cfg; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d7f5cd04/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java index ddf307e..f4f2356 100644 --- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java +++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.apache.ignite.testframework.junits.common.*; import org.apache.logging.log4j.*; import java.io.*; @@ -32,7 +31,6 @@ import java.util.*; /** * Grid Log4j2 SPI test. */ -@GridCommonTest(group = "Logger") public class Log4j2LoggerVerboseModeSelfTest extends TestCase { /** */ public static final String LOG_PATH_VERBOSE_TEST = "modules/core/src/test/config/log4j2-verbose-test.xml"; @@ -110,12 +108,10 @@ public class Log4j2LoggerVerboseModeSelfTest extends TestCase { setAddresses(Collections.singleton("127.0.0.1:47500..47509")); }}); - IgniteConfiguration cfg = new IgniteConfiguration() + return new IgniteConfiguration() .setGridName(gridName) .setGridLogger(new Log4J2Logger(logPath)) .setConnectorConfiguration(null) .setDiscoverySpi(disco); - - return cfg; } }
