Ignite-71 gridgain-log4j.xml name 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/e561bd44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e561bd44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e561bd44 Branch: refs/heads/sprint-1 Commit: e561bd4450a211a5e9842cb8bc9e3dfcb0e924cc Parents: d5bef13 Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Jan 29 13:01:58 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Jan 29 13:01:58 2015 +0300 ---------------------------------------------------------------------- assembly/release-base.xml | 2 +- config/gridgain-log4j.xml | 152 ------------------- config/ignite-log4j.xml | 152 +++++++++++++++++++ .../java/org/apache/ignite/IgniteLogger.java | 2 +- .../org/apache/ignite/internal/GridGainEx.java | 6 +- .../loadtests/nio/GridNioBenchmarkTest.java | 2 +- .../junits/logger/GridTestLog4jLogger.java | 2 +- .../child/GridHadoopExternalProcessStarter.java | 2 +- .../apache/ignite/logger/jcl/GridJclLogger.java | 4 +- .../ignite/logger/log4j/IgniteLog4jLogger.java | 2 +- .../util/nodestart/GridNodeCallableImpl.java | 2 +- 11 files changed, 164 insertions(+), 164 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e561bd44/assembly/release-base.xml ---------------------------------------------------------------------- diff --git a/assembly/release-base.xml b/assembly/release-base.xml index 5881729..3995732 100644 --- a/assembly/release-base.xml +++ b/assembly/release-base.xml @@ -28,7 +28,7 @@ </file> <file> - <source>config/gridgain-log4j.xml</source> + <source>config/ignite-log4j.xml</source> <outputDirectory>/config</outputDirectory> </file> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e561bd44/config/gridgain-log4j.xml ---------------------------------------------------------------------- diff --git a/config/gridgain-log4j.xml b/config/gridgain-log4j.xml deleted file mode 100644 index dbf3baf..0000000 --- a/config/gridgain-log4j.xml +++ /dev/null @@ -1,152 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" - "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd";> - -<!-- - Default log4j configuration for GridGain. ---> -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"; debug="false"> - <!-- - Logs System.out messages to console. - - Note, this appender is disabled by default. - To enable, uncomment the section below and also CONSOLE appender in the <root> element. - --> - <!-- - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <param name="Threshold" value="DEBUG"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n"/> - </layout> - - <filter class="org.apache.log4j.varia.LevelRangeFilter"> - <param name="levelMin" value="DEBUG"/> - <param name="levelMax" value="WARN"/> - </filter> - </appender> - --> - - <!-- - Logs all ERROR messages to console. - --> - <appender name="CONSOLE_ERR" class="org.apache.log4j.ConsoleAppender"> - <!-- Log to STDERR. --> - <param name="Target" value="System.err"/> - - <!-- Log from ERROR and higher (change to WARN if needed). --> - <param name="Threshold" value="ERROR"/> - - <!-- The default pattern: Date Priority [Category] Message\n --> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n"/> - </layout> - </appender> - - <!-- - Logs all output to specified file. - By default, the logging goes to GRIDGAIN_HOME/work/log folder - --> - <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="Append" value="true"/> - <param name="MaxFileSize" value="10MB"/> - <param name="MaxBackupIndex" value="10"/> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n"/> - </layout> - </appender> - - <!-- - <category name="org.gridgain"> - <level value="DEBUG"/> - </category> - --> - - <!-- - Uncomment this category to enable cache - query execution tracing. - --> - <!-- - <category name="org.gridgain.cache.queries"> - <level value="DEBUG"/> - </category> - --> - - <!-- - Uncomment to enable DGC tracing. - --> - <!-- - <category name="org.gridgain.grid.kernal.processors.cache.GridCacheDgcManager.trace"> - <level value="DEBUG"/> - </category> - --> - - <!-- - Uncomment to disable courtesy notices, such as SPI configuration - consistency warnings. - --> - <!-- - <category name="org.gridgain.grid.CourtesyConfigNotice"> - <level value="OFF"/> - </category> - --> - - <category name="org.springframework"> - <level value="WARN"/> - </category> - - <category name="org.eclipse.jetty"> - <level value="WARN"/> - </category> - - <!-- - Avoid warnings about failed bind attempt when multiple nodes running on the same host. - --> - <category name="org.eclipse.jetty.util.log"> - <level value="ERROR"/> - </category> - - <category name="org.eclipse.jetty.util.component"> - <level value="ERROR"/> - </category> - - <category name="com.amazonaws"> - <level value="WARN"/> - </category> - - <!-- Default settings. --> - <root> - <!-- Print out all info by default. --> - <level value="INFO"/> - - <!-- Uncomment to enable logging to console. --> - <!-- - <appender-ref ref="CONSOLE"/> - --> - - <appender-ref ref="CONSOLE_ERR"/> - <appender-ref ref="FILE"/> - </root> -</log4j:configuration> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e561bd44/config/ignite-log4j.xml ---------------------------------------------------------------------- diff --git a/config/ignite-log4j.xml b/config/ignite-log4j.xml new file mode 100644 index 0000000..dbf3baf --- /dev/null +++ b/config/ignite-log4j.xml @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" + "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd";> + +<!-- + Default log4j configuration for GridGain. +--> +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"; debug="false"> + <!-- + Logs System.out messages to console. + + Note, this appender is disabled by default. + To enable, uncomment the section below and also CONSOLE appender in the <root> element. + --> + <!-- + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + + <param name="Threshold" value="DEBUG"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n"/> + </layout> + + <filter class="org.apache.log4j.varia.LevelRangeFilter"> + <param name="levelMin" value="DEBUG"/> + <param name="levelMax" value="WARN"/> + </filter> + </appender> + --> + + <!-- + Logs all ERROR messages to console. + --> + <appender name="CONSOLE_ERR" class="org.apache.log4j.ConsoleAppender"> + <!-- Log to STDERR. --> + <param name="Target" value="System.err"/> + + <!-- Log from ERROR and higher (change to WARN if needed). --> + <param name="Threshold" value="ERROR"/> + + <!-- The default pattern: Date Priority [Category] Message\n --> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n"/> + </layout> + </appender> + + <!-- + Logs all output to specified file. + By default, the logging goes to GRIDGAIN_HOME/work/log folder + --> + <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="Append" value="true"/> + <param name="MaxFileSize" value="10MB"/> + <param name="MaxBackupIndex" value="10"/> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n"/> + </layout> + </appender> + + <!-- + <category name="org.gridgain"> + <level value="DEBUG"/> + </category> + --> + + <!-- + Uncomment this category to enable cache + query execution tracing. + --> + <!-- + <category name="org.gridgain.cache.queries"> + <level value="DEBUG"/> + </category> + --> + + <!-- + Uncomment to enable DGC tracing. + --> + <!-- + <category name="org.gridgain.grid.kernal.processors.cache.GridCacheDgcManager.trace"> + <level value="DEBUG"/> + </category> + --> + + <!-- + Uncomment to disable courtesy notices, such as SPI configuration + consistency warnings. + --> + <!-- + <category name="org.gridgain.grid.CourtesyConfigNotice"> + <level value="OFF"/> + </category> + --> + + <category name="org.springframework"> + <level value="WARN"/> + </category> + + <category name="org.eclipse.jetty"> + <level value="WARN"/> + </category> + + <!-- + Avoid warnings about failed bind attempt when multiple nodes running on the same host. + --> + <category name="org.eclipse.jetty.util.log"> + <level value="ERROR"/> + </category> + + <category name="org.eclipse.jetty.util.component"> + <level value="ERROR"/> + </category> + + <category name="com.amazonaws"> + <level value="WARN"/> + </category> + + <!-- Default settings. --> + <root> + <!-- Print out all info by default. --> + <level value="INFO"/> + + <!-- Uncomment to enable logging to console. --> + <!-- + <appender-ref ref="CONSOLE"/> + --> + + <appender-ref ref="CONSOLE_ERR"/> + <appender-ref ref="FILE"/> + </root> +</log4j:configuration> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e561bd44/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java index 1a6efb7..3b4a7ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java @@ -44,7 +44,7 @@ import org.jetbrains.annotations.*; * <bean class="org.gridgain.grid.logger.jcl.GridJclLogger"> * <constructor-arg type="org.apache.commons.logging.Log"> * <bean class="org.apache.commons.logging.impl.Log4JLogger"> - * <constructor-arg type="java.lang.String" value="config/gridgain-log4j.xml"/> + * <constructor-arg type="java.lang.String" value="config/ignite-log4j.xml"/> * </bean> * </constructor-arg> * </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e561bd44/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java b/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java index 553d874..51240b8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java @@ -2012,13 +2012,13 @@ public class GridGainEx { } if (log4jCls != null) { - URL url = U.resolveGridGainUrl("config/gridgain-log4j.xml"); + URL url = U.resolveGridGainUrl("config/ignite-log4j.xml"); if (url == null) { - File cfgFile = new File("config/gridgain-log4j.xml"); + File cfgFile = new File("config/ignite-log4j.xml"); if (!cfgFile.exists()) - cfgFile = new File("../config/gridgain-log4j.xml"); + cfgFile = new File("../config/ignite-log4j.xml"); if (cfgFile.exists()) { try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e561bd44/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java index fd635b3..51ffa76 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/nio/GridNioBenchmarkTest.java @@ -78,7 +78,7 @@ public class GridNioBenchmarkTest { } }; - IgniteLogger log = new GridTestLog4jLogger(U.resolveGridGainUrl("config/gridgain-log4j.xml")); + IgniteLogger log = new GridTestLog4jLogger(U.resolveGridGainUrl("config/ignite-log4j.xml")); GridNioServer.<ByteBuffer>builder() .address(InetAddress.getByName("localhost")) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e561bd44/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java index 4c27791..672c4f3 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/logger/GridTestLog4jLogger.java @@ -43,7 +43,7 @@ import static org.apache.ignite.IgniteSystemProperties.*; * <pre name="code" class="xml"> * <property name="gridLogger"> * <bean class="org.gridgain.grid.logger.log4j.GridLog4jLogger"> - * <constructor-arg type="java.lang.String" value="config/gridgain-log4j.xml"/> + * <constructor-arg type="java.lang.String" value="config/ignite-log4j.xml"/> * </bean> * </property> * </pre> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e561bd44/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java index 75898a6..714fc44 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/child/GridHadoopExternalProcessStarter.java @@ -35,7 +35,7 @@ import java.util.concurrent.*; */ public class GridHadoopExternalProcessStarter { /** Path to Log4j configuration file. */ - public static final String DFLT_LOG4J_CONFIG = "config/gridgain-log4j.xml"; + public static final String DFLT_LOG4J_CONFIG = "config/ignite-log4j.xml"; /** Arguments. */ private Args args; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e561bd44/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/GridJclLogger.java ---------------------------------------------------------------------- diff --git a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/GridJclLogger.java b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/GridJclLogger.java index c8a1c34..3af7890 100644 --- a/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/GridJclLogger.java +++ b/modules/jcl/src/main/java/org/apache/ignite/logger/jcl/GridJclLogger.java @@ -35,7 +35,7 @@ import org.jetbrains.annotations.*; * <bean class="org.apache.ignite.logger.jcl.GridJclLogger"> * <constructor-arg type="org.apache.commons.logging.Log"> * <bean class="org.apache.commons.logging.impl.Log4JLogger"> - * <constructor-arg type="java.lang.String" value="config/gridgain-log4j.xml"/> + * <constructor-arg type="java.lang.String" value="config/ignite-log4j.xml"/> * </bean> * </constructor-arg> * </bean> @@ -54,7 +54,7 @@ import org.jetbrains.annotations.*; * <pre name="code" class="java"> * GridConfiguration cfg = new GridConfiguration(); * ... - * GridLogger log = new GridJclLogger(new Log4JLogger("config/gridgain-log4j.xml")); + * GridLogger log = new GridJclLogger(new Log4JLogger("config/ignite-log4j.xml")); * ... * cfg.setGridLogger(log); * </pre> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e561bd44/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java index 5813c27..8e7cba6 100644 --- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java +++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java @@ -43,7 +43,7 @@ import static org.apache.ignite.IgniteSystemProperties.*; * <pre name="code" class="xml"> * <property name="gridLogger"> * <bean class="org.gridgain.grid.logger.log4j.GridLog4jLogger"> - * <constructor-arg type="java.lang.String" value="config/gridgain-log4j.xml"/> + * <constructor-arg type="java.lang.String" value="config/ignite-log4j.xml"/> * </bean> * </property> * </pre> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e561bd44/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java index 7acbc5f..be5d46c 100644 --- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java +++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/GridNodeCallableImpl.java @@ -48,7 +48,7 @@ public class GridNodeCallableImpl implements GridNodeCallable { /** * Logs folder for Windows. - * Folder for linux is configured in {@code gridgain-log4j.xml}. + * Folder for linux is configured in {@code ignite-log4j.xml}. */ private static final String LOG_DIR_WIN = "work\\log";
