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 2012/01/23 07:35:55 UTC
svn commit: r1234683 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
Author: rmannibucau
Date: Mon Jan 23 06:35:54 2012
New Revision: 1234683
URL: http://svn.apache.org/viewvc?rev=1234683&view=rev
Log:
using embedded log only for embedded cases - not for prod tomee
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java?rev=1234683&r1=1234682&r2=1234683&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java Mon Jan 23 06:35:54 2012
@@ -16,6 +16,9 @@
*/
package org.apache.openejb.util;
+import org.apache.openejb.assembler.classic.WebAppBuilder;
+import org.apache.openejb.loader.SystemInstance;
+
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
@@ -37,34 +40,39 @@ public class JuliLogStreamFactory implem
}
static {
- final Class<LogCategory> clazz = LogCategory.class;
- final List<String> loggerNames = new ArrayList<String>();
- final Enumeration<String> names = LogManager.getLogManager().getLoggerNames();
- while (names.hasMoreElements()) {
- loggerNames.add(names.nextElement());
- }
+ // if embedded case enhance a bit logging if not set
+ if (SystemInstance.get().getComponent(WebAppBuilder.class) == null
+ || System.getProperty("tomee.ejbcontainer.http.port") != null
+ || System.getProperty("tomee.arquillian.http") != null) {
+ final Class<LogCategory> clazz = LogCategory.class;
+ final List<String> loggerNames = new ArrayList<String>();
+ final Enumeration<String> names = LogManager.getLogManager().getLoggerNames();
+ while (names.hasMoreElements()) {
+ loggerNames.add(names.nextElement());
+ }
- for (Field constant : clazz.getFields()) {
- int modifiers = constant.getModifiers();
- if (Modifier.isPublic(modifiers) && Modifier.isStatic(modifiers)) {
- final String name;
- try {
- name = ((LogCategory) constant.get(null)).getName();
- } catch (IllegalAccessException e) {
- continue;
- }
- if (name.contains(".")) { // only parents
- continue;
- }
- if (!loggerNames.contains(name)) { // no conf
- final Logger logger = java.util.logging.Logger.getLogger(name);
- logger.setUseParentHandlers(false);
- LogManager.getLogManager().addLogger(logger);
- if (logger.getHandlers().length == 0) {
- logger.addHandler(new ConsoleHandler());
+ for (Field constant : clazz.getFields()) {
+ int modifiers = constant.getModifiers();
+ if (Modifier.isPublic(modifiers) && Modifier.isStatic(modifiers)) {
+ final String name;
+ try {
+ name = ((LogCategory) constant.get(null)).getName();
+ } catch (IllegalAccessException e) {
+ continue;
+ }
+ if (name.contains(".")) { // only parents
+ continue;
}
- for (Handler h : logger.getHandlers()) {
- h.setFormatter(new SingleLineFormatter());
+ if (!loggerNames.contains(name)) { // no conf
+ final Logger logger = java.util.logging.Logger.getLogger(name);
+ logger.setUseParentHandlers(false);
+ LogManager.getLogManager().addLogger(logger);
+ if (logger.getHandlers().length == 0) {
+ logger.addHandler(new ConsoleHandler());
+ }
+ for (Handler h : logger.getHandlers()) {
+ h.setFormatter(new SingleLineFormatter());
+ }
}
}
}