etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6365: support virtual host and ssl in rabbitMQ event bus 

with this fix, virtual host on the AMQP server can be specified. Also
SSL can be used for connection between management server and AMQP
servers.
This commit is contained in:
Murali Reddy 2014-04-09 17:32:16 +05:30
parent 35b2bd50e0
commit 2ad98da095
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
View File

@ -60,6 +60,18 @@ public class RabbitMQEventBus extends ManagerBase implements EventBus {
private static String username;
private static String password;
public static void setVirtualHost(String virtualHost) {
RabbitMQEventBus.virtualHost = virtualHost;
}
private static String virtualHost;
public static void setUseSsl(String useSsl) {
RabbitMQEventBus.useSsl = useSsl;
}
private static String useSsl;
// AMQP exchange name where all CloudStack events will be published
private static String amqpExchangeName;
@ -104,6 +116,12 @@ public class RabbitMQEventBus extends ManagerBase implements EventBus {
throw new ConfigurationException("Unable to get the port details of AMQP server");
}
if (useSsl != null && !useSsl.isEmpty()) {
if (!useSsl.equalsIgnoreCase("true") && !useSsl.equalsIgnoreCase("false")) {
throw new ConfigurationException("Invalid configuration parameter for 'ssl'.");
}
}
if (retryInterval == null) {
retryInterval = 10000;// default to 10s to try out reconnect
}
@ -345,9 +363,18 @@ public class RabbitMQEventBus extends ManagerBase implements EventBus {
ConnectionFactory factory = new ConnectionFactory();
factory.setUsername(username);
factory.setPassword(password);
factory.setVirtualHost("/");
factory.setHost(amqpHost);
factory.setPort(port);
if (virtualHost != null && !virtualHost.isEmpty()) {
factory.setVirtualHost(virtualHost);
} else {
factory.setVirtualHost("/");
}
if (useSsl != null && !useSsl.isEmpty() && useSsl.equalsIgnoreCase("true")) {
factory.useSslProtocol();
}
Connection connection = factory.newConnection();
connection.addShutdownListener(disconnectHandler);
s_connection = connection;