Spring/spring-amqp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQP-281 Shut Down Timer in AMQP Appender

Browse Source 
When using the AMQP log4j appender, it
can cause orphaned daemon threads when undeploying WARs.

Also, when exiting main() methods, apps should call
Log4jConfigurer.shutdownLogging(); in a finally block
to destroy() the connetion factory (releasing threads
used by the rabbit client).
This commit is contained in:
Gary Russell
2013-02-28 22:42:32 -05:00
parent 6d64d24841
commit ac96d95f97
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j/AmqpAppender.java
View File

@@ -153,7 +153,7 @@ public class AmqpAppender extends AppenderSkeleton {
/**
* Whether or not we've tried to declare this exchange yet.
*/
private AtomicBoolean exchangeDeclared = new AtomicBoolean(false);
private final AtomicBoolean exchangeDeclared = new AtomicBoolean(false);
/**
* Configuration arbitrary application ID.
@@ -163,7 +163,7 @@ public class AmqpAppender extends AppenderSkeleton {
/**
* Where LoggingEvents are queued to send.
*/
private LinkedBlockingQueue<Event> events = new LinkedBlockingQueue<Event>();
private final LinkedBlockingQueue<Event> events = new LinkedBlockingQueue<Event>();
/**
* The pool of senders.
@@ -183,7 +183,7 @@ public class AmqpAppender extends AppenderSkeleton {
/**
* Retries are delayed like: N ^ log(N), where N is the retry number.
*/
private Timer retryTimer = new Timer("log-event-retry-delay", true);
private final Timer retryTimer = new Timer("log-event-retry-delay", true);
/**
* RabbitMQ ConnectionFactory.
@@ -448,6 +448,7 @@ public class AmqpAppender extends AppenderSkeleton {
if (null != connectionFactory) {
connectionFactory.destroy();
}
retryTimer.cancel();
}
public boolean requiresLayout() {

12
spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j/AmqpAppenderIntegrationTests.java
View File

@@ -19,6 +19,8 @@ import static org.junit.Assert.assertTrue;
import java.util.concurrent.TimeUnit;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.junit.After;
@@ -104,4 +106,14 @@ public class AmqpAppenderIntegrationTests {
assertEquals(propertyValue, messageProperties.getHeaders().get(propertyName));
}
/*
* When running as main(); should shutdown cleanly.
*/
public static void main(String[] args) throws Exception {
Log4jConfigurer.initLogging("classpath:log4j-amqp.properties");
Log logger = LogFactory.getLog(AmqpAppenderIntegrationTests.class);
logger.info("foo");
Thread.sleep(1000);
Log4jConfigurer.shutdownLogging();
}
}