From 49fe2e6e1f69d390bd17c23f7f75016f704460d1 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Tue, 19 Oct 2021 17:38:03 +0200
Subject: [PATCH] fix healthz endpoint when AMQP is disabled

---
 routes/healthz/healthz_endpoint.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/routes/healthz/healthz_endpoint.go b/routes/healthz/healthz_endpoint.go
index d26c263..6975196 100644
--- a/routes/healthz/healthz_endpoint.go
+++ b/routes/healthz/healthz_endpoint.go
@@ -54,11 +54,8 @@ func getHealth(c *gin.Context) {
 	}
 
 	// check if connection to AMQP broker is alive if backend was started with AMQP client
-	url, err := configuration.GlobalConfig.StringOr("amqp.host", "not-set")
-	if err != nil && url == "not-set" {
-		c.JSON(http.StatusOK, gin.H{})
-		return
-	} else if err != nil {
+	url, err := configuration.GlobalConfig.StringOr("amqp.host", "")
+	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{
 			"success:": false,
 			"message":  err.Error(),
@@ -66,7 +63,10 @@ func getHealth(c *gin.Context) {
 		return
 	}
 
-	if len(url) != 0 {
+	if url == "" {
+		c.Writer.WriteHeader(http.StatusNoContent)
+		return
+	} else {
 		err = helper.CheckConnection()
 		if err != nil {
 			log.Println(err.Error())