From ebc36327606b86c79190d0ec385f593a05847f86 Mon Sep 17 00:00:00 2001
From: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Date: Wed, 12 Jun 2024 18:35:40 -0400
Subject: [PATCH 1/2] more attempts to gracefully shut down

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
---
 cmd/argocd-server/commands/argocd_server.go |  4 ++-
 server/server.go                            | 34 ++++++++++++---------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/cmd/argocd-server/commands/argocd_server.go b/cmd/argocd-server/commands/argocd_server.go
index eea346eaed03d..464924a87362a 100644
--- a/cmd/argocd-server/commands/argocd_server.go
+++ b/cmd/argocd-server/commands/argocd_server.go
@@ -3,11 +3,11 @@ package commands
 import (
 	"context"
 	"fmt"
+	"github.com/redis/go-redis/v9"
 	"math"
 	"time"
 
 	"github.com/argoproj/pkg/stats"
-	"github.com/redis/go-redis/v9"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/kubernetes"
@@ -209,6 +209,8 @@ func NewCommand() *cobra.Command {
 				if closer != nil {
 					closer()
 				}
+				log.Info("API Server successfully shut down.")
+				break
 			}
 		},
 	}
diff --git a/server/server.go b/server/server.go
index a994760ead47e..355c042da4c94 100644
--- a/server/server.go
+++ b/server/server.go
@@ -585,15 +585,17 @@ func (a *ArgoCDServer) Run(ctx context.Context, listeners *Listeners) {
 			}
 		}()
 
-		// Shutdown https server
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			err := httpsS.Shutdown(sCtx)
-			if err != nil {
-				log.Errorf("Error shutting down https server: %s", err)
-			}
-		}()
+		if httpsS != nil {
+			// Shutdown https server
+			wg.Add(1)
+			go func() {
+				defer wg.Done()
+				err := httpsS.Shutdown(sCtx)
+				if err != nil {
+					log.Errorf("Error shutting down https server: %s", err)
+				}
+			}()
+		}
 
 		// Shutdown gRPC server
 		wg.Add(1)
@@ -612,12 +614,14 @@ func (a *ArgoCDServer) Run(ctx context.Context, listeners *Listeners) {
 			}
 		}()
 
-		// Shutdown tls server
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			tlsm.Close()
-		}()
+		if tlsm != nil {
+			// Shutdown tls server
+			wg.Add(1)
+			go func() {
+				defer wg.Done()
+				tlsm.Close()
+			}()
+		}
 
 		// Shutdown tcp server
 		wg.Add(1)

From e1cac4976673cbf4d4c4cc7e06038e87ecd1093e Mon Sep 17 00:00:00 2001
From: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Date: Thu, 13 Jun 2024 12:32:52 -0400
Subject: [PATCH 2/2] fix import order

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
---
 cmd/argocd-server/commands/argocd_server.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/argocd-server/commands/argocd_server.go b/cmd/argocd-server/commands/argocd_server.go
index 464924a87362a..34e532209d74b 100644
--- a/cmd/argocd-server/commands/argocd_server.go
+++ b/cmd/argocd-server/commands/argocd_server.go
@@ -3,11 +3,11 @@ package commands
 import (
 	"context"
 	"fmt"
-	"github.com/redis/go-redis/v9"
 	"math"
 	"time"
 
 	"github.com/argoproj/pkg/stats"
+	"github.com/redis/go-redis/v9"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/kubernetes"