From e883d3cb73196e81f7e60ef7c93c6ca9ca0abc71 Mon Sep 17 00:00:00 2001
From: "J. Brisbin" <jon@jbrisbin.com>
Date: Mon, 18 Apr 2011 11:11:38 -0500
Subject: [PATCH] AMQP-156: Changed connectionTimeout to replyTimeout to more
 accurately describe its function. Also added a call to set this value on the
 RabbitTemplate instance.

---
 .../amqp/rabbit/log4j/AmqpAppender.java           | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j/AmqpAppender.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j/AmqpAppender.java
index c593481d..afc4ad10 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j/AmqpAppender.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j/AmqpAppender.java
@@ -61,7 +61,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
  *   log4j.appender.amqp.username=guest
  *   log4j.appender.amqp.password=guest
  *   log4j.appender.amqp.virtualHost=/
- *   log4j.appender.amqp.connectionTimeout=0
+ *   log4j.appender.amqp.replyTimeout=0
  *   #-------------------------------
  *   ## Exchange name and type
  *   #-------------------------------
@@ -142,7 +142,7 @@ public class AmqpAppender extends AppenderSkeleton {
 	/**
 	 * How long to wait for a connection to time out.
 	 */
-	private int connectionTimeout = 0;
+	private int replyTimeout = 0;
 	/**
 	 * Configuration arbitrary application ID.
 	 */
@@ -288,8 +288,12 @@ public class AmqpAppender extends AppenderSkeleton {
 		this.declareExchange = declareExchange;
 	}
 
-	public int getConnectionTimeout() {
-		return connectionTimeout;
+	public int getReplyTimeout() {
+		return replyTimeout;
+	}
+
+	public void setReplyTimeout(int replyTimeout) {
+		this.replyTimeout = replyTimeout;
 	}
 
 	public String getContentType() {
@@ -418,6 +422,9 @@ public class AmqpAppender extends AppenderSkeleton {
 		public void run() {
 			try {
 				RabbitTemplate rabbitTmpl = new RabbitTemplate(connectionFactory);
+				if (replyTimeout > 0) {
+					rabbitTmpl.setReplyTimeout(replyTimeout);
+				}
 				while (true) {
 					final Event event = events.take();
 					LoggingEvent logEvent = event.getEvent();