From 94a276f2510d1821f2bd148640dd3a418f23eb9a Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy@zelinskie.com>
Date: Wed, 3 Nov 2021 18:07:09 -0400
Subject: [PATCH] fix enabled flag

---
 cobrautil.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/cobrautil.go b/cobrautil.go
index 4167e1e..8c9e352 100644
--- a/cobrautil.go
+++ b/cobrautil.go
@@ -253,18 +253,20 @@ func GrpcServerFromFlags(cmd *cobra.Command, flagPrefix string, opts ...grpc.Ser
 func GrpcListenFromFlags(cmd *cobra.Command, flagPrefix string, srv *grpc.Server) error {
 	flagPrefix = stringz.DefaultEmpty(flagPrefix, "grpc")
 
+	if !MustGetBool(cmd, flagPrefix+"-enabled") {
+		return nil
+	}
+
 	addr := MustGetStringExpanded(cmd, flagPrefix+"-addr")
 	l, err := net.Listen("tcp", addr)
 	if err != nil {
 		return fmt.Errorf("failed to listen on addr for gRPC server: %w", err)
 	}
 
-	if MustGetBool(cmd, flagPrefix+"-enabled") {
-		err = srv.Serve(l)
-		if err != nil {
-			return fmt.Errorf("failed to serve gRPC: %w", err)
-		}
+	if err := srv.Serve(l); err != nil {
+		return fmt.Errorf("failed to serve gRPC: %w", err)
 	}
+
 	return nil
 }
 
@@ -297,7 +299,7 @@ func HttpServerFromFlags(cmd *cobra.Command, flagPrefix string) *http.Server {
 // HttpListenFromFlags listens on an HTTP server using the configuration stored
 // in the cobra command that was registered with RegisterHttpServerFlags.
 func HttpListenFromFlags(cmd *cobra.Command, flagPrefix string, srv *http.Server) error {
-	if MustGetBool(cmd, flagPrefix+"-enabled") {
+	if !MustGetBool(cmd, flagPrefix+"-enabled") {
 		return nil
 	}