Skip to content

Control actions #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
helena wants to merge 9 commits into from
Closed

Control actions #8

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dfa3e5b
Removed RabbitBrokerAdmin hard-coded module and function calls, repla…
Feb 22, 2011
062f9b7
Merge branch 'master' into ctl-commands
Feb 22, 2011
741eff6
Added functionality to get the broker version in RabbitBrokerAdmin.
Feb 22, 2011
0586f05
Added copyright.
Feb 23, 2011
215b4e7
Removed explicit default erlang converter from RabbitControlErlangCon…
Feb 23, 2011
0565723
Removed host parameter passed into initializeDefaultErlangTemplate me…
Feb 23, 2011
fac4363
Cleaned up unused method parameters and made a few small performance …
Feb 23, 2011
4b6ed4e
Removed explicit unnecessary call to outer class
Feb 23, 2011
7b1a5ac
Merge branch 'broker-admin' into control-actions
Feb 23, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions spring-rabbit/src/main/java/org/springframework/amqp/rabbit/admin/RabbitBrokerAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Matcher;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Pattern;

import org.apache.commons.logging.Log;
Expand Down Expand Up @@ -170,7 +169,7 @@ public RabbitBrokerAdmin(String nodeName, int port, String cookie) {
this.nodeName = nodeName;
this.executor.setDaemon(true);

initializeDefaultErlangTemplate(nodeName);
initializeDefaultErlangTemplate();

}

Expand Down Expand Up @@ -364,7 +363,7 @@ public void startNode() {
String rabbitHome = System.getProperty("RABBITMQ_HOME", System.getenv("RABBITMQ_HOME"));
if (rabbitHome == null) {
if (Os.isFamily("windows") || Os.isFamily("dos")) {
rabbitHome = findDirectoryName("c:/Program Files", "rabbitmq");
rabbitHome = findDirectoryName("c:/Program Files");
} else if (Os.isFamily("unix") || Os.isFamily("mac")) {
rabbitHome = "/usr/lib/rabbitmq";
}
Expand Down Expand Up @@ -529,7 +528,7 @@ public RabbitStatus call() throws Exception {
* @param child
* @return the full name of a directory
*/
private String findDirectoryName(String parent, String child) {
private String findDirectoryName(String parent) {
String result = null;
String[] names = new File(parent).list(new FilenameFilter() {
public boolean accept(File dir, String name) {
Expand Down Expand Up @@ -612,14 +611,12 @@ public ErlangTemplate getErlangTemplate() {
}

/**
* TODO host is not used in method.
* @param host
* Initializes the ErlangTemplate.
*/
protected void initializeDefaultErlangTemplate(String host) {
String peerNodeName = nodeName;
logger.debug("Creating jinterface connection with peerNodeName = [" + peerNodeName + "]");
protected void initializeDefaultErlangTemplate() {
logger.debug("Creating jinterface connection with peerNodeName = [" + nodeName + "]");
SimpleConnectionFactory otpConnectionFactory = new SimpleConnectionFactory("rabbit-spring-monitor",
peerNodeName, this.cookie);
nodeName, this.cookie);
otpConnectionFactory.afterPropertiesSet();
createErlangTemplate(otpConnectionFactory);
}
Expand Down