Completed merge

This commit is contained in:
Kai Zimmermann
2016-03-04 12:21:38 +01:00
parent 25832e7e16
commit a227ede0e0
2 changed files with 5 additions and 6 deletions

View File

@@ -38,6 +38,6 @@ hawkbit.controller.pollingTime=00:05:00
hawkbit.controller.pollingOverdueTime=00:05:00
## Configuration for RabbitMQ integration
hawkbit.dmf.rabbitmq.deadLetterQueue=dmf_connector_deadletter
hawkbit.dmf.rabbitmq.deadLetterExchange=dmf.connector.deadletter
hawkbit.dmf.rabbitmq.deadLetterQueue=dmf_receiver_deadletter
hawkbit.dmf.rabbitmq.deadLetterExchange=dmf.receiver.deadletter
hawkbit.dmf.rabbitmq.receiverQueue=dmf_receiver

View File

@@ -23,12 +23,12 @@ public class AmqpProperties {
/**
* DMF API dead letter queue.
*/
private String deadLetterQueue = "dmf_connector_deadletter";
private String deadLetterQueue = "dmf_receiver_deadletter";
/**
* DMF API dead letter exchange.
*/
private String deadLetterExchange = "dmf.connector.deadletter";
private String deadLetterExchange = "dmf.receiver.deadletter";
/**
* DMF API receiving queue.
@@ -36,8 +36,7 @@ public class AmqpProperties {
private String receiverQueue = "dmf_receiver";
/**
* Missing queue fatal, see
* {@link SimpleMessageListenerContainer#setMissingQueuesFatal(boolean)}.
* Missing queue fatal.
*/
private boolean missingQueuesFatal = false;