From 5a55b8384a377580762eee74bebdcf462afce627 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 26 Aug 2009 12:01:51 +0000 Subject: [PATCH] refined logging in JMS SingleConnectionFactory and DefaultMessageListenerContainer --- .../jms/connection/SingleConnectionFactory.java | 5 +++-- .../jms/listener/DefaultMessageListenerContainer.java | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java b/org.springframework.jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java index 5afebf0056..239c51f28b 100644 --- a/org.springframework.jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java +++ b/org.springframework.jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java @@ -234,7 +234,7 @@ public class SingleConnectionFactory } public QueueConnection createQueueConnection() throws JMSException { - Connection con = null; + Connection con; synchronized (this.connectionMonitor) { this.pubSubMode = Boolean.FALSE; con = createConnection(); @@ -252,7 +252,7 @@ public class SingleConnectionFactory } public TopicConnection createTopicConnection() throws JMSException { - Connection con = null; + Connection con; synchronized (this.connectionMonitor) { this.pubSubMode = Boolean.TRUE; con = createConnection(); @@ -298,6 +298,7 @@ public class SingleConnectionFactory * Exception listener callback that renews the underlying single Connection. */ public void onException(JMSException ex) { + logger.warn("Encountered a JMSException - resetting the underlying JMS Connection", ex); resetConnection(); } diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java b/org.springframework.jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java index 2b325d8027..d366f9d018 100644 --- a/org.springframework.jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java +++ b/org.springframework.jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java @@ -738,10 +738,10 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe msg.append(getDestinationDescription()).append("' - trying to recover. Cause: "); msg.append(ex instanceof JMSException ? JmsUtils.buildExceptionMessage((JMSException) ex) : ex.getMessage()); if (logger.isDebugEnabled()) { - logger.info(msg, ex); + logger.warn(msg, ex); } else { - logger.info(msg); + logger.warn(msg); } } } @@ -792,10 +792,10 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe msg.append(this.recoveryInterval).append(" ms. Cause: "); msg.append(ex instanceof JMSException ? JmsUtils.buildExceptionMessage((JMSException) ex) : ex.getMessage()); if (logger.isDebugEnabled()) { - logger.info(msg, ex); + logger.warn(msg, ex); } - else if (logger.isInfoEnabled()) { - logger.info(msg); + else { + logger.warn(msg); } } sleepInbetweenRecoveryAttempts();