Ignite-71 logging fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/23fd3d73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/23fd3d73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/23fd3d73 Branch: refs/heads/sprint-1 Commit: 23fd3d738842db83190de3e6898bdeeced81cdd6 Parents: 6c992c0 Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Jan 29 14:22:12 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Jan 29 14:22:12 2015 +0300 ---------------------------------------------------------------------- config/ignite-log4j.xml | 2 +- config/java.util.logging.properties | 14 +- .../integration/ClientAbstractSelfTest.java | 2 +- .../rest/RestBinaryProtocolSelfTest.java | 2 +- .../handlers/log/GridLogCommandHandler.java | 2 +- .../java/IgniteJavaLoggerFileHandler.java | 2 +- modules/core/src/test/config/log4j-test.xml | 2 +- .../testframework/junits/GridAbstractTest.java | 2 +- .../logger/GridLog4jRollingFileAppender.java | 2 +- .../src/test/resources/log/gridgain.log.tst | 13706 ----------------- .../core/src/test/resources/log/ignite.log.tst | 13706 +++++++++++++++++ .../logger/log4j/IgniteLog4jNodeIdFilePath.java | 4 +- .../log4j/GridLog4jCorrectFileNameTest.java | 2 +- 13 files changed, 13724 insertions(+), 13724 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23fd3d73/config/ignite-log4j.xml ---------------------------------------------------------------------- diff --git a/config/ignite-log4j.xml b/config/ignite-log4j.xml index dbf3baf..d8fefb7 100644 --- a/config/ignite-log4j.xml +++ b/config/ignite-log4j.xml @@ -69,7 +69,7 @@ --> <appender name="FILE" class="org.gridgain.grid.logger.log4j.GridLog4jRollingFileAppender"> <param name="Threshold" value="DEBUG"/> - <param name="File" value="${GRIDGAIN_HOME}/work/log/gridgain.log"/> + <param name="File" value="${GRIDGAIN_HOME}/work/log/ignite.log"/> <param name="Append" value="true"/> <param name="MaxFileSize" value="10MB"/> <param name="MaxBackupIndex" value="10"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23fd3d73/config/java.util.logging.properties ---------------------------------------------------------------------- diff --git a/config/java.util.logging.properties b/config/java.util.logging.properties index 3ffdde3..19dddb4 100644 --- a/config/java.util.logging.properties +++ b/config/java.util.logging.properties @@ -16,7 +16,7 @@ # ######################################################################### -# Default java.util.logging configuration for GridGain. +# Default java.util.logging configuration for Ignite. # # To use another config file use `java.util.logging.config.file` system # property. For example `java -Djava.util.logging.config.file=myfile` @@ -64,11 +64,11 @@ java.util.logging.ConsoleHandler.formatter=org.apache.ignite.logger.java.IgniteJ java.util.logging.ConsoleHandler.level=INFO # -# File handler logs all messages into files with pattern `gridgain-%{id8}.%g.log` +# File handler logs all messages into files with pattern `ignite-%{id8}.%g.log` # under `$GRIDGAIN_HOME/work/log/` directory. The placeholder `%{id8}` is a truncated node ID. # -org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.formatter=org.apache.ignite.logger.java.IgniteJavaLoggerFormatter -org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.pattern=gridgain-%{id8}.%g.log -org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.level=INFO -org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.limit=10485760 -org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.count=10 +org.apache.ignite.logger.java.IgniteJavaLoggerFileHandler.formatter=org.apache.ignite.logger.java.IgniteJavaLoggerFormatter +org.apache.ignite.logger.java.IgniteJavaLoggerFileHandler.pattern=ignite-%{id8}.%g.log +org.apache.ignite.logger.java.IgniteJavaLoggerFileHandler.level=INFO +org.apache.ignite.logger.java.IgniteJavaLoggerFileHandler.limit=10485760 +org.apache.ignite.logger.java.IgniteJavaLoggerFileHandler.count=10 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23fd3d73/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java index cee7608..e6f0063 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java @@ -79,7 +79,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { private static final Map<String, HashMapStore> cacheStores = new HashMap<>(); /** Path to test log. */ - private static final String TEST_LOG_PATH = "modules/core/src/test/resources/log/gridgain.log.tst"; + private static final String TEST_LOG_PATH = "modules/core/src/test/resources/log/ignite.log.tst"; /** */ public static final String ROUTER_LOG_CFG = "modules/core/src/test/config/log4j-test.xml"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23fd3d73/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java index f14a4ad..5d60f4f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java @@ -553,7 +553,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testLog() throws Exception { - String path = "work/log/gridgain.log." + System.currentTimeMillis(); + String path = "work/log/ignite.log." + System.currentTimeMillis(); File file = new File(U.getGridGainHome(), path); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23fd3d73/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java index 6a676fd..03a6ae4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java @@ -41,7 +41,7 @@ public class GridLogCommandHandler extends GridRestCommandHandlerAdapter { private static final Collection<GridRestCommand> SUPPORTED_COMMANDS = U.sealList(LOG); /** Default log path. */ - private static final String DFLT_PATH = "work/log/gridgain.log"; + private static final String DFLT_PATH = "work/log/ignite.log"; /** Approximate line length. */ private static final int LINE_LENGTH = 120; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23fd3d73/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFileHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFileHandler.java b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFileHandler.java index f3c529b..e424bdf 100644 --- a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFileHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFileHandler.java @@ -85,7 +85,7 @@ public final class IgniteJavaLoggerFileHandler extends StreamHandler { String ptrn = manager.getProperty(clsName + ".pattern"); if (ptrn == null) - ptrn = "gridgain-%{id8}.%g.log"; + ptrn = "ignite-%{id8}.%g.log"; ptrn = new File(logDirectory(), ptrn.replace("%{id8}", U.id8(nodeId))).getAbsolutePath(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23fd3d73/modules/core/src/test/config/log4j-test.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/log4j-test.xml b/modules/core/src/test/config/log4j-test.xml index d9feb40..0f29c37 100644 --- a/modules/core/src/test/config/log4j-test.xml +++ b/modules/core/src/test/config/log4j-test.xml @@ -66,7 +66,7 @@ --> <appender name="FILE" class="org.apache.log4j.RollingFileAppender"> <param name="Threshold" value="DEBUG"/> - <param name="File" value="${GRIDGAIN_HOME}/work/log/gridgain.log"/> + <param name="File" value="${GRIDGAIN_HOME}/work/log/ignite.log"/> <param name="Append" value="true"/> <param name="MaxFileSize" value="10MB"/> <param name="MaxBackupIndex" value="10"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23fd3d73/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 4a4ca95..50315fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -231,7 +231,7 @@ public abstract class GridAbstractTest extends TestCase { file.setName("FILE"); file.setThreshold(log4jLevel); - file.setFile(home() + "/work/log/gridgain.log"); + file.setFile(home() + "/work/log/ignite.log"); file.setAppend(false); file.setMaxFileSize("10MB"); file.setMaxBackupIndex(10); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23fd3d73/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridLog4jRollingFileAppender.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridLog4jRollingFileAppender.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridLog4jRollingFileAppender.java index 7be2574..0a7dfef 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridLog4jRollingFileAppender.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridLog4jRollingFileAppender.java @@ -93,7 +93,7 @@ public class GridLog4jRollingFileAppender extends RollingFileAppender implements String tmpDir = IgniteSystemProperties.getString("java.io.tmpdir"); if (tmpDir != null) { - baseFileName = new File(tmpDir, "gridgain.log").getAbsolutePath(); + baseFileName = new File(tmpDir, "ignite.log").getAbsolutePath(); fileName = U.nodeIdLogFileName(nodeId, baseFileName); }
