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:23 UTC
[20/24] incubator-ignite git commit: # ignite-788: refactor
# ignite-788: refactor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5dc5e392
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5dc5e392
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5dc5e392
Branch: refs/heads/ignite-788-last-review
Commit: 5dc5e3928c9009e90c0be078c3a090147878567d
Parents: f2264e0
Author: ashutak <as...@gridgain.com>
Authored: Fri Jul 17 20:03:23 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Fri Jul 17 20:03:23 2015 +0300
----------------------------------------------------------------------
.../ignite/logger/log4j2/Log4J2Logger.java | 96 +++++---------------
.../logger/log4j2/GridLog4j2SelfTest.java | 34 ++++---
2 files changed, 37 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dc5e392/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 4dc5e6f..48cfef0 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
@@ -75,7 +75,6 @@ public class Log4J2Logger implements IgniteLogger, LoggerNodeIdAware {
/** */
public static final String CONSOLE_APPENDER = "autoConfiguredIgniteConsoleAppender";
- public static final String CONSOLE_LOGGER_NAME = LogManager.ROOT_LOGGER_NAME;
/** */
private static volatile boolean inited;
@@ -335,91 +334,38 @@ public class Log4J2Logger implements IgniteLogger, LoggerNodeIdAware {
}
}
-// private void createConsoleLogger(Logger logger, Level maxLevel) {
-// final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
-//
-// final Configuration cfg = ctx.getConfiguration();
-//
-// 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, Level.ALL, null);
-//
-// LoggerConfig newLogCfg = LoggerConfig.createLogger("false", oldLogCfg.getLevel(),
-// oldLogCfg.getName(), "true", new AppenderRef[]{ref}, null, cfg, null);
-//
-// newLogCfg.addAppender(appender, Level.ALL, null);
-//
-// cfg.addLogger(logger.getName(), oldLogCfg);
-//
-// ctx.reconfigure();
-// ctx.updateLoggers();
-// }
-
- /**
- * Creates console appender with some reasonable default logging settings.
- *
- * @param maxLevel Max logging level.
- * @return New console appender.
- */
- // TODO review.
-// private void createConsoleLogger(Logger log, Level maxLevel) {
-// ConsoleAppender consoleApp = ConsoleAppender.createAppender(PatternLayout.createDefaultLayout(), null,
-// "SYSTEM_OUT", CONSOLE_APPENDER, null, null);
-//
-// final LoggerContext ctx = log.getContext();
-//
-// final Configuration cfg = ctx.getConfiguration();
-//
-// consoleApp.start();
-//
-// cfg.addAppender(consoleApp);
-//
-// AppenderRef ref = AppenderRef.createAppenderRef(CONSOLE_APPENDER, null, null);
-//
-// LoggerConfig logCfg = LoggerConfig.createLogger("true", null, log.getName(),
-// "true", new AppenderRef[] {ref}, null, cfg, null);
-//
-// logCfg.getAppenderRefs().add(ref);
-//
-// cfg.addLogger(log.getName(), logCfg);
-//
-// ctx.updateLoggers();
-//
-// return consoleApp;
-// }
/**
* Creates console appender with some reasonable default logging settings.
*
* @param maxLevel Max logging level.
* @return New console appender.
*/
- // TODO review.
public static Logger createConsoleLogger(Logger log, Level maxLevel) {
-// ((Log4jContextFactory)LogManager.getFactory()).getSelector().
+ LoggerContext ctx = (LoggerContext)LogManager.getContext(true);
- LoggerContext context= (LoggerContext) LogManager.getContext(true);
- Configuration config= context.getConfiguration();
+ Configuration cfg = ctx.getConfiguration();
+
+ PatternLayout layout = PatternLayout.createLayout("[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n", null, null,
+ Charset.defaultCharset(), false, false, null, null);
+
+ Appender appender = ConsoleAppender.createAppender(layout, null, null, "CONSOLE_APPENDER", null, null);
- PatternLayout layout= PatternLayout.createLayout("[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n", null, null, Charset.defaultCharset(),false,false,null,null);
- Appender appender=ConsoleAppender.createAppender(layout, null, null, "CONSOLE_APPENDER", null, null);
appender.start();
- AppenderRef ref= AppenderRef.createAppenderRef("CONSOLE_APPENDER",null,null);
- AppenderRef[] refs = new AppenderRef[] {ref};
- LoggerConfig loggerConfig= LoggerConfig.createLogger("false", Level.INFO,CONSOLE_LOGGER_NAME,"",refs,null,null,null);
- loggerConfig.addAppender(appender,null,null);
- config.addAppender(appender);
- config.addLogger(CONSOLE_LOGGER_NAME, loggerConfig);
- context.updateLoggers(config);
+ AppenderRef ref = AppenderRef.createAppenderRef("CONSOLE_APPENDER", null, null);
+
+ LoggerConfig logCfg = LoggerConfig.createLogger("false", Level.INFO, LogManager.ROOT_LOGGER_NAME, "",
+ new AppenderRef[] {ref}, null, null, null);
+
+ logCfg.addAppender(appender, null, null);
+
+ cfg.addAppender(appender);
+
+ cfg.addLogger(LogManager.ROOT_LOGGER_NAME, logCfg);
+
+ ctx.updateLoggers(cfg);
- return (Logger)LogManager.getContext().getLogger(CONSOLE_LOGGER_NAME);
+ return (Logger)LogManager.getContext().getLogger(LogManager.ROOT_LOGGER_NAME);
}
/** {@inheritDoc} */
@@ -496,7 +442,7 @@ public class Log4J2Logger implements IgniteLogger, LoggerNodeIdAware {
/** {@inheritDoc} */
@Override public void warning(String msg) {
impl.warn(msg);
- if (LogManager.getContext().getLogger(CONSOLE_LOGGER_NAME) != null) LogManager.getContext().getLogger(CONSOLE_LOGGER_NAME).warn(msg);
+ if (consoleLogger != null) consoleLogger.warn(msg);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5dc5e392/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2SelfTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2SelfTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2SelfTest.java
index 3b07fa9..1a44be2 100644
--- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2SelfTest.java
+++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2SelfTest.java
@@ -127,18 +127,7 @@ public class GridLog4j2SelfTest extends TestCase {
System.setProperty("IGNITE_QUIET", "false");
- TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
- disco.setIpFinder(new TcpDiscoveryVmIpFinder(false) {{
- setAddresses(Collections.singleton("127.0.0.1:47500..47509"));
- }});
-
- IgniteConfiguration cfg = new IgniteConfiguration()
- .setGridLogger(new Log4J2Logger(LOG_PATH_VERBOSE_TEST))
- .setConnectorConfiguration(null)
- .setDiscoverySpi(disco);
-
- try (Ignite ignite = G.start(cfg)) {
+ try (Ignite ignite = G.start(getConfiguration("verboseLogGrid", LOG_PATH_VERBOSE_TEST))) {
String testInfoMsg = "******* Hello Tester! INFO message *******";
String testDebugMsg = "******* Hello Tester! DEBUG message *******";
@@ -152,9 +141,12 @@ public class GridLog4j2SelfTest extends TestCase {
}
}
finally {
+ System.setProperty("IGNITE_QUIET", "true");
+
// Restore the stdout and write the String to stdout.
System.setOut(backupSysOut);
+ System.out.println("***** It was at output *****");
System.out.println(testOut.toString());
}
}
@@ -180,7 +172,7 @@ public class GridLog4j2SelfTest extends TestCase {
String id8;
File logFile;
- try (Ignite ignite = G.start(getConfiguration("grid" + id))) {
+ try (Ignite ignite = G.start(getConfiguration("grid" + id, LOG_PATH_TEST))) {
id8 = U.id8(ignite.cluster().localNode().id());
String logPath = "work/log/ignite-" + id8 + ".log";
@@ -202,17 +194,23 @@ public class GridLog4j2SelfTest extends TestCase {
* Creates grid configuration.
*
* @param gridName Grid name.
+ * @param logPath
* @return Grid configuration.
* @throws Exception If error occurred.
*/
- private static IgniteConfiguration getConfiguration(String gridName)
+ private static IgniteConfiguration getConfiguration(String gridName, String logPath)
throws Exception {
- IgniteConfiguration cfg = new IgniteConfiguration();
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
- cfg.setGridName(gridName);
+ disco.setIpFinder(new TcpDiscoveryVmIpFinder(false) {{
+ setAddresses(Collections.singleton("127.0.0.1:47500..47509"));
+ }});
- cfg.setGridLogger(new Log4J2Logger(LOG_PATH_MAIN));
- cfg.setConnectorConfiguration(null);
+ IgniteConfiguration cfg = new IgniteConfiguration()
+ .setGridName(gridName)
+ .setGridLogger(new Log4J2Logger(logPath))
+ .setConnectorConfiguration(null)
+ .setDiscoverySpi(disco);
return cfg;
}