Added flag -sb/--skip-binding-queues

Author: mcintyredu

src/main/java/com/rabbitmq/perf/MulticastParams.java

@@ -49,6 +49,7 @@ public class MulticastParams {
     private List<String> queueNames = new ArrayList<String>();
     private String routingKey = null;
     private boolean randomRoutingKey = false;
+    private boolean skipBindingQueues = false;
 
     private List<?> flags = new ArrayList<Object>();
 
@@ -88,6 +89,10 @@ public void setRoutingKey(String routingKey) {
     public void setRandomRoutingKey(boolean randomRoutingKey) {
         this.randomRoutingKey = randomRoutingKey;
     }
+    
+    public void setSkipBindingQueues(boolean skipBindingQueues) {
+    	this.skipBindingQueues = skipBindingQueues;
+    }
 
     public void setProducerRateLimit(float producerRateLimit) {
         this.producerRateLimit = producerRateLimit;
@@ -225,6 +230,10 @@ public String getRoutingKey() {
     public boolean getRandomRoutingKey() {
         return randomRoutingKey;
     }
+    
+    public boolean getSkipBindingQueues() {
+    	return skipBindingQueues;
+    }
 
     public void setBodyFiles(List<String> bodyFiles) {
         if (bodyFiles == null) {
@@ -303,7 +312,7 @@ public List<String> configureQueues(Connection connection, String id) throws IOE
             generatedQueueNames.add(qName);
             // skipping binding to default exchange,
             // as it's not possible to explicitly bind to it.
-            if (!predeclared && !"".equals(exchangeName) && !"amq.default".equals(exchangeName)) {
+            if (!"".equals(exchangeName) && !"amq.default".equals(exchangeName) && !skipBindingQueues) {
                 channel.queueBind(qName, exchangeName, id);
             }
         }

src/main/java/com/rabbitmq/perf/PerfTest.java

@@ -63,6 +63,7 @@ public static void main(String[] args) {
             String queueNames        = strArg(cmd, 'u', null);
             String routingKey        = strArg(cmd, 'k', null);
             boolean randomRoutingKey = cmd.hasOption('K');
+            boolean skipBindingQueues= cmd.hasOption("sb");
             int samplingInterval     = intArg(cmd, 'i', 1);
             float producerRateLimit  = floatArg(cmd, 'r', 0.0f);
             float consumerRateLimit  = floatArg(cmd, 'R', 0.0f);
@@ -170,6 +171,7 @@ public void run() {
             p.setProducerTxSize(        producerTxSize);
             p.setQueueNames(            queueNames == null ? null : asList(queueNames.split(",")));
             p.setRoutingKey(            routingKey);
+            p.setSkipBindingQueues(     skipBindingQueues);
             p.setRandomRoutingKey(      randomRoutingKey);
             p.setProducerRateLimit(     producerRateLimit);
             p.setTimeLimit(             timeLimit);
@@ -235,6 +237,7 @@ private static Options getOptions() {
         options.addOption(new Option("u", "queue",                  true, "queue name"));
         options.addOption(new Option("k", "routing-key",            true, "routing key"));
         options.addOption(new Option("K", "random-routing-key",     false,"use random routing key per message"));
+        options.addOption(new Option("sb", "skip-binding-queues",   false,"don't bind queues to the exchange"));
         options.addOption(new Option("i", "interval",               true, "sampling interval in seconds"));
         options.addOption(new Option("r", "rate",                   true, "producer rate limit"));
         options.addOption(new Option("R", "consumer-rate",          true, "consumer rate limit"));