ongoing work on LOGBACK-1247, with test fail

qos-ch · Feb 11, 2017 · be08427 · be08427
1 parent bdd3952
commit be08427
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/logback-core/src/main/java/ch/qos/logback/core/AsyncAppenderBase.java b/logback-core/src/main/java/ch/qos/logback/core/AsyncAppenderBase.java
@@ -121,7 +121,7 @@ public void stop() {
         super.stop();
 
         // interrupt the worker thread so that it can terminate. Note that the interruption can be consumed
-        // by sub-appenders
+        // by the sub-appender
         worker.interrupt();
         try {
             worker.join(maxFlushTime);

diff --git a/logback-core/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java b/logback-core/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java
@@ -103,6 +103,7 @@ public void workerShouldStopEvenIfInterruptExceptionConsumedWithinSubappender()
         asyncAppenderBase.stop();
         verify(delayingListAppender, 1);
         assertTrue(delayingListAppender.interrupted);
+        Thread.interrupted();
     }
 
     @Test(timeout = 2000)
@@ -239,10 +240,29 @@ public void verifyInterruptionIsNotSwallowed() {
         Thread.currentThread().interrupt();
         asyncAppenderBase.doAppend(new Integer(0));
         assertTrue(Thread.currentThread().isInterrupted());
-        // clear flag for next test
+        // clear interrupt flag for subsequent tests
         Thread.interrupted();
     }
 
+    // Interruption of current thread should not prevent logging. 
+    // See also http://jira.qos.ch/browse/LOGBACK-910
+    // and https://jira.qos.ch/browse/LOGBACK-1247
+    @Test
+    public void verifyInterruptionDoesNotPreventLogging() {
+        asyncAppenderBase.addAppender(listAppender);
+        asyncAppenderBase.start();
+        asyncAppenderBase.doAppend(new Integer(0));
+        Thread.currentThread().interrupt();
+        asyncAppenderBase.doAppend(new Integer(1));
+        asyncAppenderBase.doAppend(new Integer(1));
+        assertTrue(Thread.currentThread().isInterrupted());
+        asyncAppenderBase.stop();
+        verify(listAppender, 3);
+        // clear interrupt flag for subsequent tests
+        Thread.interrupted();
+    }
+
+
     @Test
     public void verifyInterruptionOfWorkerIsSwallowed() {
         asyncAppenderBase.addAppender(delayingListAppender);

diff --git a/logback-core/src/test/java/ch/qos/logback/core/testUtil/DelayingListAppender.java b/logback-core/src/test/java/ch/qos/logback/core/testUtil/DelayingListAppender.java
@@ -29,6 +29,7 @@ public void append(E e) {
         try {
             Thread.sleep(delay);
         } catch (InterruptedException ie) {
+            // consume InterruptedException
             interrupted = true;
         }
         super.append(e);