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 2015/07/20 16:55:20 UTC
[17/24] incubator-ignite git commit: # ignite-788: make sens
# ignite-788: make sens
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d3315ebb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d3315ebb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d3315ebb
Branch: refs/heads/ignite-788-last-review
Commit: d3315ebbed46c46acfd1e661f48477aa7bf99f81
Parents: 2fcafcd
Author: ashutak <as...@gridgain.com>
Authored: Fri Jul 17 17:11:38 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Fri Jul 17 17:11:38 2015 +0300
----------------------------------------------------------------------
.../src/test/config/log4j2-verbose-test.xml | 43 +++++++++++
.../ignite/logger/log4j2/ContextTestTmp.java | 79 +++++++++-----------
2 files changed, 79 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3315ebb/modules/core/src/test/config/log4j2-verbose-test.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/log4j2-verbose-test.xml b/modules/core/src/test/config/log4j2-verbose-test.xml
new file mode 100644
index 0000000..4c75689
--- /dev/null
+++ b/modules/core/src/test/config/log4j2-verbose-test.xml
@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<Configuration>
+ <!--<Appenders>-->
+ <!--<Routing name="FILE">-->
+ <!--<Routes pattern="$${sys:nodeId}">-->
+ <!--<Route>-->
+ <!--<RollingFile name="Rolling-${sys:nodeId}" fileName="${sys:IGNITE_HOME}/work/log/ignite-${sys:nodeId}.log"-->
+ <!--filePattern="${sys:IGNITE_HOME}/work/log/ignite-${sys:nodeId}-%i-%d{yyyy-MM-dd}.log.gz">-->
+ <!--<PatternLayout pattern="[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n"/>-->
+ <!--<Policies>-->
+ <!--<TimeBasedTriggeringPolicy interval="6" modulate="true" />-->
+ <!--<SizeBasedTriggeringPolicy size="10 MB" />-->
+ <!--</Policies>-->
+ <!--</RollingFile>-->
+ <!--</Route>-->
+ <!--</Routes>-->
+ <!--</Routing>-->
+ <!--</Appenders>-->
+
+ <!--<Loggers>-->
+ <!--<Root level="INFO">-->
+ <!--<!–<AppenderRef ref="FILE" level="DEBUG"/>–>-->
+ <!--</Root>-->
+ <!--</Loggers>-->
+</Configuration>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3315ebb/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/ContextTestTmp.java
----------------------------------------------------------------------
diff --git a/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/ContextTestTmp.java b/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/ContextTestTmp.java
index 1f858da..5b6d4ad 100644
--- a/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/ContextTestTmp.java
+++ b/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/ContextTestTmp.java
@@ -38,27 +38,48 @@ public class ContextTestTmp {
public static void main(String[] args) throws Exception {
final Level maxLevel = Level.DEBUG;
- final URL cfgUrl = U.resolveIgniteUrl("config/ignite-log4j2.xml");
+ final URL cfgUrl = U.resolveIgniteUrl("modules/core/src/test/config/log4j2-verbose-test.xml");
Configurator.initialize(LogManager.ROOT_LOGGER_NAME, cfgUrl.toString());
-// addConsoleAppender(LogManager.getRootLogger(), Level.INFO);
-//
-// logTest();
+ LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+ AbstractConfiguration cfg = (AbstractConfiguration) ctx.getConfiguration();
+ ConsoleAppender appender = ConsoleAppender.createDefaultAppenderForLayout(PatternLayout.createDefaultLayout());
+ appender.start();
+ cfg.addAppender(appender);
+ AppenderRef[] refs = new AppenderRef[] { AppenderRef.createAppenderRef(appender.getName(), null, null) };
+ LoggerConfig loggerConfig = LoggerConfig.createLogger("false", Level.ALL, LogManager.ROOT_LOGGER_NAME, "true", refs, null, cfg, null);
+ loggerConfig.addAppender(appender, null, null);
+ cfg.addLogger(LogManager.ROOT_LOGGER_NAME, loggerConfig);
+ ctx.updateLoggers();
-// Appender appender = FileAppender.createAppender(U.getIgniteHome() + "/work/log/test.log", "false", "false", "File", "true",
-// "false", "false", "4000", PatternLayout.createDefaultLayout(), null, "false", null,
-// ((LoggerContext) LogManager.getContext(false)).getConfiguration());
-//
-// addAppender(LogManager.getRootLogger(), appender, Level.INFO);
+ logTest();
- System.out.println(((org.apache.logging.log4j.core.Logger)LogManager.getRootLogger()).getAppenders());
+ System.out.println("FInish");
+ }
- Configuration cfg = ((LoggerContext)LogManager.getContext(false)).getConfiguration();
- System.out.println(cfg.getAppenders().containsKey("Console"));
-// System.out.println(cfg.getA.containsKey("Console"));
+ private static void doIt(org.apache.logging.log4j.core.Logger log){
+ ConsoleAppender console = ConsoleAppender.createAppender(PatternLayout.createDefaultLayout(), null,
+ "SYSTEM_OUT", "consoleApp", null, null);
- logTest();
+ final LoggerContext ctx = (LoggerContext)LogManager.getContext(false);
+
+ final Configuration cfg = ctx.getConfiguration();
+
+ console.start();
+
+ cfg.addAppender(console);
+
+ AppenderRef ref = AppenderRef.createAppenderRef("consoleApp", null, null);
+
+ LoggerConfig loggerConfig = LoggerConfig.createLogger("true", Level.ALL, LogManager.ROOT_LOGGER_NAME,
+ "true", new AppenderRef[] {ref}, null, cfg, null );
+
+ loggerConfig.addAppender(console, null, null);
+
+ cfg.addLogger(LogManager.ROOT_LOGGER_NAME, loggerConfig);
+
+ ctx.updateLoggers();
}
private static void logTest() {
@@ -73,37 +94,9 @@ public class ContextTestTmp {
}
private static void addConsoleAppender(final Logger logger, final Level maxLevel) {
- final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
-
- final Configuration cfg = ctx.getConfiguration();
-
-// for (Appender a : loggerConfig.getAppenders().values()) {
-// if (a instanceof ConsoleAppender)
-// return;
-// }
-
ConsoleAppender appender = ConsoleAppender.createAppender(PatternLayout.createDefaultLayout(), null,
"SYSTEM_OUT", CONSOLE_APPENDER, null, null);
- appender.start();
-
- cfg.addAppender(appender);
-
- LoggerConfig oldLogCfg = cfg.getLoggerConfig(logger.getName());
-
- AppenderRef ref = AppenderRef.createAppenderRef(CONSOLE_APPENDER, maxLevel, null);
-
- LoggerConfig newLogCfg = LoggerConfig.createLogger("false", oldLogCfg.getLevel(),
- oldLogCfg.getName(), "true", new AppenderRef[]{ref}, null, cfg, null);
-
- newLogCfg.addAppender(appender, maxLevel, null);
-
- cfg.addLogger(logger.getName(), oldLogCfg);
-
- ctx.updateLoggers();
- }
-
- private static void addAppender(final Logger logger, Appender appender, final Level maxLevel) {
final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
final Configuration cfg = ctx.getConfiguration();
@@ -114,7 +107,7 @@ public class ContextTestTmp {
LoggerConfig loggerConfig = cfg.getLoggerConfig(logger.getName());
- AppenderRef ref = AppenderRef.createAppenderRef("File", maxLevel, null);
+ AppenderRef ref = AppenderRef.createAppenderRef(CONSOLE_APPENDER, maxLevel, null);
loggerConfig.getAppenderRefs().add(ref);