Merge pull request #10 from t-h-e/fix/purge-queue

Purge queue in `sample` rather than `testEnded`
aliesbelik · May 21, 2022 · acec348 · acec348
2 parents a7180a7 + 0619ca8
commit acec348
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/main/java/com/zeroclue/jmeter/protocol/amqp/AMQPConsumer.java b/src/main/java/com/zeroclue/jmeter/protocol/amqp/AMQPConsumer.java
@@ -82,6 +82,11 @@ public SampleResult sample(Entry entry) {
 
         try {
             initChannel();
+
+            if (purgeQueue()) {
+                doPurgeQueue();
+            }
+
             // only do this once per thread, otherwise it slows down the consumption by appx 50%
             if (consumer == null) {
                 log.info("Creating consumer");
@@ -140,7 +145,6 @@ public SampleResult sample(Entry entry) {
             /*
              * Set up the sample result details
              */
-
             result.setResponseMessage("OK");
             result.setDataType(SampleResult.TEXT);
             result.setResponseHeaders(delivery != null ? formatHeaders(delivery) : null);
@@ -193,6 +197,15 @@ public boolean purgeQueue() {
         return Boolean.parseBoolean(getPurgeQueue());
     }
 
+    private void doPurgeQueue() {
+        log.info("Purging queue {}", getQueue());
+        try {
+            channel.queuePurge(getQueue());
+        } catch (IOException e) {
+            log.error("Failed to purge queue " + getQueue(), e);
+        }
+    }
+
     /**
      * @return the whether or not to auto ack
      */
@@ -287,15 +300,6 @@ public boolean interrupt() {
     @Override
     public void testEnded() {
 
-        if (purgeQueue()) {
-            log.info("Purging queue {}", getQueue());
-
-            try {
-                channel.queuePurge(getQueue());
-            } catch (IOException e) {
-                log.error("Failed to purge queue " + getQueue(), e);
-            }
-        }
     }
 
     @Override