Graceful api server shutdown tweaks (#4)

* more attempts to gracefully shut down

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* fix import order

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

---------

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

cmd/argocd-server/commands/argocd_server.go

@@ -209,6 +209,8 @@ func NewCommand() *cobra.Command {
 				if closer != nil {
 					closer()
 				}
+				log.Info("API Server successfully shut down.")
+				break
 			}
 		},
 	}

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)