You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/08/14 14:28:03 UTC
svn commit: r1617918 -
/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
Author: rmannibucau
Date: Thu Aug 14 12:28:03 2014
New Revision: 1617918
URL: http://svn.apache.org/r1617918
Log:
if user wants to force logs we should respect it whatever the environment is
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java?rev=1617918&r1=1617917&r2=1617918&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java Thu Aug 14 12:28:03 2014
@@ -51,7 +51,8 @@ public class JuliLogStreamFactory implem
// if embedded case enhance a bit logging if not set
final Options options = SystemInstance.get().getOptions();
- if ((!tomee || embedded) && System.getProperty("java.util.logging.manager") == null) {
+ final boolean forceLogs = options.get("openejb.jul.forceReload", false);
+ if ((!tomee || embedded || forceLogs) && System.getProperty("java.util.logging.manager") == null) {
System.setProperty("java.util.logging.manager", OpenEJBLogManager.class.getName());
if (options.get(OPENEJB_LOG_COLOR_PROP, false) && isNotIDE()) {
consoleHandlerClazz = org.apache.openejb.log.ConsoleColorHandler.class.getName();
@@ -65,7 +66,7 @@ public class JuliLogStreamFactory implem
consoleHandlerClazz = ConsoleHandler.class.getName();
}
- if (options.get("openejb.jul.forceReload", false)) {
+ if (forceLogs) {
useOpenEJBHandler = options.get("openejb.jul.forceReload.use-openejb-handler", true);
try {
final Field logManager = LogManager.class.getDeclaredField("manager");