From 20e86ed27a0815136b44fc6b450f6b5d253a7efe Mon Sep 17 00:00:00 2001
From: Ricardo Lopes <ricardoapl.dev@gmail.com>
Date: Wed, 14 Feb 2024 11:21:14 +0000
Subject: [PATCH] Refactor and rename custom error pages vars

Signed-off-by: Ricardo Lopes <ricardoapl.dev@gmail.com>
---
 images/custom-error-pages/rootfs/main.go | 53 ++++++++++--------------
 1 file changed, 22 insertions(+), 31 deletions(-)

diff --git a/images/custom-error-pages/rootfs/main.go b/images/custom-error-pages/rootfs/main.go
index 8aa9dd9de..609b9d473 100644
--- a/images/custom-error-pages/rootfs/main.go
+++ b/images/custom-error-pages/rootfs/main.go
@@ -69,13 +69,13 @@ const (
 	// cannot be mapped to a file extension.
 	DefaultFormatVar = "DEFAULT_RESPONSE_FORMAT"
 
-	// IsExposeSignalsVar is the name of the environment variable indicating
-	// whether or not to expose signals such as /metrics and /healthz.
-	IsExposeSignalsVar = "IS_EXPOSE_SIGNALS"
+	// IsExportMetricsVar is the name of the environment variable indicating
+	// whether or not to export /metrics and /healthz.
+	IsExportMetricsVar = "IS_EXPORT_METRICS"
 
-	// ExposeSignalsPortVar is the name of the environment variable indicating
-	// the port on which to expose signals such as /metrics and /healthz.
-	ExposeSignalsPortVar = "EXPOSE_SIGNALS_PORT"
+	// MetricsPortVar is the name of the environment variable indicating
+	// the port on which to export /metrics and /healthz.
+	MetricsPortVar = "METRICS_PORT"
 
 	// CustomErrorPagesPort is the port on which to listen to serve custom error pages.
 	CustomErrorPagesPort = "8080"
@@ -97,59 +97,50 @@ func main() {
 		defaultFormat = os.Getenv(DefaultFormatVar)
 	}
 
-	isExposeSignals := true
-	if os.Getenv(IsExposeSignalsVar) != "" {
-		val, err := strconv.ParseBool(os.Getenv(IsExposeSignalsVar))
+	isExportMetrics := true
+	if os.Getenv(IsExportMetricsVar) != "" {
+		val, err := strconv.ParseBool(os.Getenv(IsExportMetricsVar))
 		if err == nil {
-			isExposeSignals = val
+			isExportMetrics = val
 		}
 	}
 
-	exposeSignalsPort := "8080"
-	if os.Getenv(ExposeSignalsPortVar) != "" {
-		exposeSignalsPort = os.Getenv(ExposeSignalsPortVar)
+	metricsPort := "8080"
+	if os.Getenv(MetricsPortVar) != "" {
+		metricsPort = os.Getenv(MetricsPortVar)
 	}
 
 	var mux *http.ServeMux
-	if isExposeSignals {
-		if exposeSignalsPort == CustomErrorPagesPort {
+	if isExportMetrics {
+		if metricsPort == CustomErrorPagesPort {
 			mux = http.DefaultServeMux
-			mux.HandleFunc("/", errorHandler(errFilesPath, defaultFormat))
 			mux.Handle("/metrics", promhttp.Handler())
 			mux.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
 				w.WriteHeader(http.StatusOK)
 			})
-			err := http.ListenAndServe(fmt.Sprintf(":%s", CustomErrorPagesPort), mux)
-			if err != nil {
-				panic(err)
-			}
 		} else {
 			mux = http.NewServeMux()
-			mux.HandleFunc("/", errorHandler(errFilesPath, defaultFormat))
 			http.Handle("/metrics", promhttp.Handler())
 			http.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
 				w.WriteHeader(http.StatusOK)
 			})
 			go func() {
-				err := http.ListenAndServe(fmt.Sprintf(":%s", CustomErrorPagesPort), mux)
+				err := http.ListenAndServe(fmt.Sprintf(":%s", metricsPort), nil)
 				if err != nil {
 					panic(err)
 				}
 			}()
-			err := http.ListenAndServe(fmt.Sprintf(":%s", exposeSignalsPort), nil)
-			if err != nil {
-				panic(err)
-			}
 		}
 	} else {
 		// Use a new ServerMux because expvar HTTP handler registers itself against DefaultServerMux
 		// as a consequence of importing it in client_golang/prometheus.
 		mux = http.NewServeMux()
-		mux.HandleFunc("/", errorHandler(errFilesPath, defaultFormat))
-		err := http.ListenAndServe(fmt.Sprintf(":%s", CustomErrorPagesPort), mux)
-		if err != nil {
-			panic(err)
-		}
+	}
+
+	mux.HandleFunc("/", errorHandler(errFilesPath, defaultFormat))
+	err := http.ListenAndServe(fmt.Sprintf(":%s", CustomErrorPagesPort), mux)
+	if err != nil {
+		panic(err)
 	}
 }