Close Rabbitmq connections properly

kedacore · Sep 25, 2019 · 2e59532 · 2e59532
1 parent 4bd1784
commit 2e59532
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 36 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,30 +1,20 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Launch",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "${workspaceFolder}/cmd/main.go",
-            "env": {
-            },
-            "args": [ 
-
-                "--lister-kubeconfig",
-                "${env:HOME}/.kube/config"
-
-            ],
-            "windows": {
-
-                "args": [
-                    "--lister-kubeconfig",
-                    "${env:USERPROFILE}\\.kube\\config"
-                ]
-            }
-        }
-    ]
-}
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Launch",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${workspaceFolder}/cmd/main.go",
+      "env": {
+        "CONFIG": "${env:HOME}/.kube/config"
+      },
+      "args": [],
+      "windows": {}
+    }
+  ]
+}
diff --git a/pkg/handler/scale_handler.go b/pkg/handler/scale_handler.go
@@ -328,6 +328,7 @@ func (h *ScaleHandler) handleScale(ctx context.Context, scaledObject *keda_v1alp
 	isScaledObjectActive := false
 
 	for _, scaler := range scalers {
+		defer scaler.Close()
 		isTriggerActive, err := scaler.IsActive(ctx)
 
 		if err != nil {
@@ -337,7 +338,6 @@ func (h *ScaleHandler) handleScale(ctx context.Context, scaledObject *keda_v1alp
 			isScaledObjectActive = true
 			log.Debugf("Scaler %s for scaledObject %s/%s is active", scaler, scaledObject.GetNamespace(), scaledObject.GetName())
 		}
-		scaler.Close()
 	}
 
 	h.scaleDeployment(deployment, scaledObject, isScaledObjectActive)

diff --git a/pkg/scalers/rabbitmq_scaler.go b/pkg/scalers/rabbitmq_scaler.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/streadway/amqp"
 	v2beta1 "k8s.io/api/autoscaling/v2beta1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -102,14 +103,9 @@ func getConnectionAndChannel(host string) (*amqp.Connection, *amqp.Channel, erro
 func (s *rabbitMQScaler) Close() error {
 	err := s.connection.Close()
 	if err != nil {
+		log.Errorf("Error closing rabbitmq connection: %v", err)
 		return err
 	}
-
-	err = s.channel.Close()
-	if err != nil {
-		return err
-	}
-
 	return nil
 }