AMQP-206 Polishing

Cleanup retry counter name; trap exception on cancel of
temporary reply queue.

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java

@@ -399,12 +399,23 @@ public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProp
 							Thread.currentThread().interrupt();
 						}
 					}
+					@Override
+					public void handleCancel(String consumerTag)
+							throws IOException {
+						logger.debug("CANCELLED");
+					}
 				};
 				channel.basicConsume(replyTo, noAck, consumerTag, noLocal, exclusive, null, consumer);
 				doSend(channel, exchange, routingKey, message);
 				Message reply = (replyTimeout < 0) ? replyHandoff.take() : replyHandoff.poll(replyTimeout,
 						TimeUnit.MILLISECONDS);
-				channel.basicCancel(consumerTag);
+				try {
+					channel.basicCancel(consumerTag);
+				} catch (Exception e) {
+					if (logger.isDebugEnabled()) {
+						logger.debug("Error cancelling consumerTag " + consumerTag, e);
+					}
+				}
 				return reply;
 			}
 		});

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java

@@ -200,9 +200,9 @@ public void start() throws AmqpException {
 			} catch (IOException e) {
 				if (passiveDeclareTries > 0) {
 					if (logger.isWarnEnabled()) {
-						logger.warn("Reconnect failed; retries left=" + passiveDeclareTries, e);
+						logger.warn("Reconnect failed; retries left=" + (passiveDeclareTries-1), e);
 						try {
-							Thread.sleep(1000);
+							Thread.sleep(5000);
 						} catch (InterruptedException e1) {
 							Thread.currentThread().interrupt();
 						}