Do we want to add an openejb.log.async = true to ensure we can go back
to previous behavior?

+0 from me


Romain Manni-Bucau
Twitter: @rmannibucau
Blog: http://rmannibucau.wordpress.com/
LinkedIn: http://fr.linkedin.com/in/rmannibucau
Github: https://github.com/rmannibucau



---------- Forwarded message ----------
From:  <[email protected]>
Date: 2014-07-14 17:45 GMT+02:00
Subject: svn commit: r1610443 - in
/tomee/tomee/trunk/container/openejb-core: ./
src/main/java/org/apache/openejb/log/
src/main/java/org/apache/openejb/util/
src/test/java/org/apache/openejb/core/stateless/
To: [email protected]


Author: andygumbrecht
Date: Mon Jul 14 15:45:06 2014
New Revision: 1610443

URL: http://svn.apache.org/r1610443
Log:
Asynchronous logging.

Added:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java
      - copied, changed from r1610424,
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java
Modified:
    tomee/tomee/trunk/container/openejb-core/pom.xml
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/SingleLineFormatter.java
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
    
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInstanceManagerPoolingTest.java

Modified: tomee/tomee/trunk/container/openejb-core/pom.xml
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/pom.xml?rev=1610443&r1=1610442&r2=1610443&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/pom.xml Mon Jul 14 15:45:06 2014
@@ -709,6 +709,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
+            <reuseForks>false</reuseForks>
               
<argLine>"-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar"
-Xdebug
                 -Xnoagent -Djava.compiler=NONE
                 -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/SingleLineFormatter.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/SingleLineFormatter.java?rev=1610443&r1=1610442&r2=1610443&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/SingleLineFormatter.java
(original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/SingleLineFormatter.java
Mon Jul 14 15:45:06 2014
@@ -31,7 +31,7 @@ public class SingleLineFormatter extends
         final StringBuilder sbuf = new StringBuilder();
         sbuf.append(record.getLevel().getLocalizedName());
         sbuf.append(" - ");
-        sbuf.append(formatMessage(record));
+        sbuf.append(this.formatMessage(record));
         sbuf.append(SEP);
         if (exception) {
             try {

Copied: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java
(from r1610424,
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java)
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java?p2=tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java&p1=tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java&r1=1610424&r2=1610443&rev=1610443&view=diff
==============================================================================
--- 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java
(original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LogStreamAsync.java
Mon Jul 14 15:45:06 2014
@@ -142,7 +142,7 @@ public class LogStreamAsync implements L
         }
     }

-    private static class Message {
+    private static final class Message {

         private final LogStream ls;
         private final level l;
@@ -161,7 +161,7 @@ public class LogStreamAsync implements L
         }
     }

-    private static class Consumer implements Runnable {
+    private static final class Consumer implements Runnable {

         private final BlockingQueue<Message> queue;


Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java?rev=1610443&r1=1610442&r2=1610443&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
(original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
Mon Jul 14 15:45:06 2014
@@ -40,6 +40,7 @@ public class Logger {
     }

     // don't return the instance since it needs to stay private but
export which one is used to allow integration with other libs (as
tomcat ;))
+    @SuppressWarnings("UnusedDeclaration")
     public static String delegateClass() {
         if (logStreamFactory == null) {
             throw new IllegalStateException("Call this method after
having configured the logger");
@@ -271,8 +272,8 @@ public class Logger {

     public Logger(final LogCategory category, final LogStream
logStream, final String baseName) {
         this.category = category;
-        this.logStream = logStream;
         this.baseName = baseName;
+        this.logStream = new LogStreamAsync(logStream);
     }

     public static Logger getInstance(final LogCategory category,
final Class clazz) {
@@ -388,6 +389,7 @@ public class Logger {
         return logStream.isWarnEnabled();
     }

+    @SuppressWarnings("UnusedDeclaration")
     public boolean isLevelEnable(final String level) {
         if ("info".equals(level.toLowerCase())) {
             return isInfoEnabled();

Modified: 
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInstanceManagerPoolingTest.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInstanceManagerPoolingTest.java?rev=1610443&r1=1610442&r2=1610443&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInstanceManagerPoolingTest.java
(original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInstanceManagerPoolingTest.java
Mon Jul 14 15:45:06 2014
@@ -93,8 +93,7 @@ public class StatelessInstanceManagerPoo

     public void testStatelessBeanRelease() throws Exception {

-
-        final int count = 10; //Strict pool can starve on more than 10
+        final int count = 20;
         final CountDownLatch invocations = new CountDownLatch(count);
         final InitialContext ctx = new InitialContext();
         final Runnable counterBeanLocal = new Runnable() {
@@ -261,7 +260,7 @@ public class StatelessInstanceManagerPoo
         public void explode(final CountDownLatch latch) {
             discardedInstances.incrementAndGet();
             try {
-                throw new NullPointerException("Test expected this
null pointer");
+                throw new NullPointerException("Test expected this
null pointer: " + latch.getCount());
             } finally {
                 latch.countDown();
             }

Reply via email to