Adjusting the message count logic when using includeUnacked (#781)

* Removing the addition of the unack-ed message count as the message count currently included unacknowledged messages Signed-off-by: Travis Bickford <tbickford@shutterstock.com>
kedacore · May 5, 2020 · 63c35dd · 63c35dd
1 parent 1ec79ec
commit 63c35dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/scalers/rabbitmq_scaler.go b/pkg/scalers/rabbitmq_scaler.go
@@ -175,7 +175,8 @@ func (s *rabbitMQScaler) getQueueMessages() (int, error) {
 		if err != nil {
 			return -1, err
 		} else {
-			return info.Messages + info.MessagesUnacknowledged, nil
+			// messages count includes count of ready and unack-ed
+			return info.Messages, nil
 		}
 	} else {
 		items, err := s.channel.QueueInspect(s.metadata.queueName)

diff --git a/pkg/scalers/rabbitmq_scaler_test.go b/pkg/scalers/rabbitmq_scaler_test.go
@@ -62,7 +62,7 @@ type getQueueInfoTestData struct {
 
 var testQueueInfoTestData = []getQueueInfoTestData{
 	{`{"messages": 4, "messages_unacknowledged": 1, "name": "evaluate_trials"}`, http.StatusOK, true},
-	{`{"messages": 0, "messages_unacknowledged": 1, "name": "evaluate_trials"}`, http.StatusOK, true},
+	{`{"messages": 1, "messages_unacknowledged": 1, "name": "evaluate_trials"}`, http.StatusOK, true},
 	{`{"messages": 1, "messages_unacknowledged": 0, "name": "evaluate_trials"}`, http.StatusOK, true},
 	{`{"messages": 0, "messages_unacknowledged": 0, "name": "evaluate_trials"}`, http.StatusOK, false},
 	{`Password is incorrect`, http.StatusUnauthorized, false},