From 5d686103fbb4361bebc305c731c9358d038e2836 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 02 Nov 2017 13:41:24 +0800
Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/task.git
---
src/main/resources/rabbitmq.xml | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/rabbitmq.xml b/src/main/resources/rabbitmq.xml
index 6279b11..58b7444 100644
--- a/src/main/resources/rabbitmq.xml
+++ b/src/main/resources/rabbitmq.xml
@@ -21,40 +21,34 @@
<constructor-arg ref="rabbitConnectionFactory"></constructor-arg>
</bean>
- <rabbit:queue name="devices_storage_data" durable="true" exclusive="false" auto-delete="false"/>
-
<rabbit:fanout-exchange name="devices_data" durable="true" auto-delete="false">
<rabbit:bindings>
<rabbit:binding queue="devices_storage_data"></rabbit:binding>
</rabbit:bindings>
</rabbit:fanout-exchange>
- <!--<bean id="amqpMsgListener" class="com.moral.monitor.listener.MonitorListener"/>-->
- <!--<bean id="amqpMsgListener" class="com.moral.monitor.listener.Listener"/>-->
+ <rabbit:queue name="devices_storage_data" durable="true" auto-delete="false" exclusive="false"/>
+
<bean id="amqpMsgListener" class="com.moral.monitor.listener.TaskListener"/>
<rabbit:listener-container connection-factory="rabbitConnectionFactory" acknowledge="auto" >
- <rabbit:listener queues="devices_storage_data" ref="amqpMsgListener" />
+ <rabbit:listener queues="devices_storage_data" ref="amqpMsgListener" />
</rabbit:listener-container>
- <rabbit:queue name="monitors_storage_data" durable="false" auto-delete="true" exclusive="false" />
-
- <rabbit:fanout-exchange name="monitors_data" durable="false" auto-delete="true">
+ <rabbit:fanout-exchange name="monitors_data2" durable="true" auto-delete="false">
+ <!--
<rabbit:bindings>
- <rabbit:binding queue="monitors_storage_data"></rabbit:binding>
+ <rabbit:binding queue="monitors_storage_data2"></rabbit:binding>
</rabbit:bindings>
+ -->
</rabbit:fanout-exchange>
+
+ <!--<rabbit:queue name="monitors_storage_data2" durable="false" auto-delete="true" exclusive="false" />-->
<!--http://blog.csdn.net/u012204058/article/details/54292888-->
<!--http://blog.csdn.net/itmrchen/article/details/53285648-->
<!--<rabbit:queue name="monitors_storage_alarm" durable="true" auto-delete="false" exclusive="false" />-->
- <!--<rabbit:fanout-exchange name="monitors_alarm" durable="true" auto-delete="false">-->
- <!--<rabbit:bindings>-->
- <!--<rabbit:binding queue="monitors_storage_alarm"></rabbit:binding>-->
- <!--</rabbit:bindings>-->
- <!--</rabbit:fanout-exchange>-->
-
- <rabbit:fanout-exchange name="monitors_alarm" durable="true" auto-delete="false" />
+ <!--<rabbit:fanout-exchange name="monitors_alarm" durable="true" auto-delete="false" />-->
</beans>
\ No newline at end of file
--
Gitblit v1.8.0