fix the bug in creating exchange on AMQP
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/abd76859 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/abd76859 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/abd76859 Branch: refs/heads/events-framework Commit: abd7685928735cefdfddf10cfa573fa45be30d07 Parents: 7d9381e Author: Murali Reddy <[email protected]> Authored: Fri Dec 14 16:49:17 2012 +0530 Committer: Murali Reddy <[email protected]> Committed: Fri Dec 14 16:49:17 2012 +0530 ---------------------------------------------------------------------- .../apache/cloudstack/framework/events/Event.java | 3 ++- .../cloudstack/mom/rabbitmq/RabbitMQEventBus.java | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/abd76859/framework/events/src/org/apache/cloudstack/framework/events/Event.java ---------------------------------------------------------------------- diff --git a/framework/events/src/org/apache/cloudstack/framework/events/Event.java b/framework/events/src/org/apache/cloudstack/framework/events/Event.java index 96d0b76..f35bbef 100644 --- a/framework/events/src/org/apache/cloudstack/framework/events/Event.java +++ b/framework/events/src/org/apache/cloudstack/framework/events/Event.java @@ -29,6 +29,7 @@ public class Event { String description; String publisher; String date; + String resourceType; public Event(String category, String type, String routingKey) { this.category = category; @@ -58,7 +59,7 @@ public class Event { public void setDescription (Object message) { Gson gson = new Gson(); - this.description = gson.toJson(description).toString(); + this.description = gson.toJson(message).toString(); } public String getEventPublisher() { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/abd76859/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java ---------------------------------------------------------------------- diff --git a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java index a3685e8..3c51cd7 100644 --- a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java +++ b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java @@ -102,20 +102,21 @@ public class RabbitMQEventBus implements EventBus { } } - private void createExchange(String eventCategory) throws Exception { - String exchangeName = getExchangeName(eventCategory); + private void createExchange(String exchangeName) throws Exception { try { _channel.exchangeDeclare(exchangeName, "topic", true); } catch (java.io.IOException exception) { - s_logger.error("Failed to create exchange on RabbitMQ server for the event category " + eventCategory); + s_logger.error("Failed to create exchange" + exchangeName + " on RabbitMQ server"); throw exception; } } private void publishEventToExchange(String exchangeName, String routingKey, String eventDescription) throws Exception { try { + _channel.txSelect(); byte[] messageBodyBytes = eventDescription.getBytes(); _channel.basicPublish(exchangeName, routingKey, MessageProperties.PERSISTENT_TEXT_PLAIN, messageBodyBytes); + _channel.txCommit(); } catch (Exception e) { s_logger.error("Failed to publish event " + routingKey + " on exchange " + exchangeName + " of message broker due to " + e.getMessage());
