Merge pull request #18 from Nosto/feature/add-log4j2-support

Add support for Log4j2
Nosto · May 3, 2016 · 63594d7 · 63594d7
2 parents bfc2f86 + bfb4693
commit 63594d7
Show file tree

Hide file tree

Showing 12 changed files with 107 additions and 153 deletions.
diff --git a/framework/lib/log4j-1.2.17.jar b/framework/lib/log4j-1.2.17.jar
diff --git a/framework/lib/log4j-api-2.5.jar b/framework/lib/log4j-api-2.5.jar
diff --git a/framework/lib/log4j-core-2.5.jar b/framework/lib/log4j-core-2.5.jar
diff --git a/framework/lib/log4j-slf4j-impl-2.5.jar b/framework/lib/log4j-slf4j-impl-2.5.jar
diff --git a/framework/lib/slf4j-api-1.7.16.jar b/framework/lib/slf4j-api-1.7.16.jar
diff --git a/framework/lib/slf4j-api-1.7.21.jar b/framework/lib/slf4j-api-1.7.21.jar
diff --git a/framework/lib/slf4j-ext-1.7.21.jar b/framework/lib/slf4j-ext-1.7.21.jar
diff --git a/framework/lib/slf4j-log4j12-1.7.16.jar b/framework/lib/slf4j-log4j12-1.7.16.jar
diff --git a/framework/src/play/Logger.java b/framework/src/play/Logger.java
diff --git a/framework/src/play/db/DBPlugin.java b/framework/src/play/db/DBPlugin.java
@@ -22,7 +22,6 @@
 import org.apache.commons.lang.StringUtils;
 
 import jregex.Matcher;
-import org.apache.log4j.Level;
 import play.Logger;
 import play.Play;
 import play.PlayPlugin;

diff --git a/framework/src/play/db/jpa/JPAPlugin.java b/framework/src/play/db/jpa/JPAPlugin.java
@@ -1,7 +1,10 @@
 package play.db.jpa;
 
 import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.log4j.Level;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.LoggerConfig;
 import org.hibernate.ejb.Ejb3Configuration;
 
 import play.Logger;
@@ -117,7 +120,10 @@ public EntityManager em(String key) {
     @Override
     public void onApplicationStart() {  
         org.hibernate.ejb.HibernatePersistence persistence = new org.hibernate.ejb.HibernatePersistence();
-        org.apache.log4j.Logger.getLogger("org.hibernate.SQL").setLevel(Level.OFF);
+        LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+        LoggerConfig loggerConfig = ctx.getConfiguration().getLoggerConfig("org.hibernate.SQL");
+        loggerConfig.setLevel(Level.OFF);
+        ctx.updateLoggers();
 
         Set<String> dBNames = Configuration.getDbNames();
         for (String dbName : dBNames) {
@@ -185,7 +191,10 @@ public void onApplicationStart() {
             properties.put("hibernate.dialect", getDefaultDialect(dbConfig, dbConfig.getProperty("db.driver")));
 
             if (dbConfig.getProperty("jpa.debugSQL", "false").equals("true")) {
-                org.apache.log4j.Logger.getLogger("org.hibernate.SQL").setLevel(Level.ALL);
+                ctx = (LoggerContext) LogManager.getContext(false);
+                loggerConfig = ctx.getConfiguration().getLoggerConfig("org.hibernate.SQL");
+                loggerConfig.setLevel(Level.ALL);
+                ctx.updateLoggers();
             }
 
             Thread thread = Thread.currentThread();

diff --git a/framework/src/play/utils/ANSIConsoleAppender.java b/framework/src/play/utils/ANSIConsoleAppender.java