CLEANUP/MINOR: extract local services setup to separate functions

Author: oktalz

pkg/controller/builder.go

@@ -120,59 +120,13 @@ func (builder *Builder) Build() *HAProxyController {
 	}
 
 	chShutdown := make(chan struct{})
+
 	if builder.osArgs.ControllerPort != 0 {
-		rtr := router.New()
-		var runningServices string
-		if builder.osArgs.PprofEnabled {
-			rtr.GET("/debug/pprof/{profile:*}", pprofhandler.PprofHandler)
-			runningServices += " pprof"
-		}
-		if builder.osArgs.PrometheusEnabled {
-			rtr.GET("/metrics", fasthttpadaptor.NewFastHTTPHandler(promhttp.Handler()))
-			runningServices += ", prometheus"
-		}
-		rtr.GET("/healtz", requestHandler)
-		// all others will be 404
-		go func() {
-			server := fasthttp.Server{
-				Handler:               rtr.Handler,
-				NoDefaultServerHeader: true,
-			}
-			go func() {
-				<-chShutdown
-				if err := server.Shutdown(); err != nil {
-					logger.Errorf("Could not gracefully shutdown controller data server: %v\n", err)
-				} else {
-					logger.Errorf("Gracefully shuting down controller data server")
-				}
-			}()
-			logger.Infof("running controller data server on :%d, running%s", builder.osArgs.ControllerPort, runningServices)
-			err := server.ListenAndServe(":" + strconv.Itoa(builder.osArgs.ControllerPort))
-			logger.Error(err)
-		}()
+		addControllerMetricData(builder, chShutdown)
 	}
 
 	if builder.osArgs.DefaultBackendService.String() == "" {
-		rtr := router.New()
-		rtr.GET("/healtz", requestHandler)
-		// all others will be 404
-		go func() {
-			server := fasthttp.Server{
-				Handler:               rtr.Handler,
-				NoDefaultServerHeader: true,
-			}
-			go func() {
-				<-chShutdown
-				if err := server.Shutdown(); err != nil {
-					logger.Errorf("Could not gracefully shutdown controller data server: %v\n", err)
-				} else {
-					logger.Errorf("Gracefully shuting down controller data server")
-				}
-			}()
-			logger.Infof("running default backend server on :%d", builder.osArgs.DefaultBackendPort)
-			err := server.ListenAndServe(":" + strconv.Itoa(builder.osArgs.DefaultBackendPort))
-			logger.Error(err)
-		}()
+		addLocalDefaultService(builder, chShutdown)
 	}
 
 	haproxy, err := haproxy.New(builder.osArgs, builder.haproxyEnv, builder.haproxyCfgFile, builder.haproxyProcess, builder.haproxyClient, builder.haproxyRules)
@@ -194,6 +148,61 @@ func (builder *Builder) Build() *HAProxyController {
 	}
 }
 
+func addControllerMetricData(builder *Builder, chShutdown chan struct{}) {
+	rtr := router.New()
+	var runningServices string
+	if builder.osArgs.PprofEnabled {
+		rtr.GET("/debug/pprof/{profile:*}", pprofhandler.PprofHandler)
+		runningServices += " pprof"
+	}
+	if builder.osArgs.PrometheusEnabled {
+		rtr.GET("/metrics", fasthttpadaptor.NewFastHTTPHandler(promhttp.Handler()))
+		runningServices += ", prometheus"
+	}
+	rtr.GET("/healtz", requestHandler)
+	// all others will be 404
+	go func() {
+		server := fasthttp.Server{
+			Handler:               rtr.Handler,
+			NoDefaultServerHeader: true,
+		}
+		go func() {
+			<-chShutdown
+			if err := server.Shutdown(); err != nil {
+				logger.Errorf("Could not gracefully shutdown controller data server: %v\n", err)
+			} else {
+				logger.Errorf("Gracefully shuting down controller data server")
+			}
+		}()
+		logger.Infof("running controller data server on :%d, running%s", builder.osArgs.ControllerPort, runningServices)
+		err := server.ListenAndServe(":" + strconv.Itoa(builder.osArgs.ControllerPort))
+		logger.Error(err)
+	}()
+}
+
+func addLocalDefaultService(builder *Builder, chShutdown chan struct{}) {
+	rtr := router.New()
+	rtr.GET("/healtz", requestHandler)
+	// all others will be 404
+	go func() {
+		server := fasthttp.Server{
+			Handler:               rtr.Handler,
+			NoDefaultServerHeader: true,
+		}
+		go func() {
+			<-chShutdown
+			if err := server.Shutdown(); err != nil {
+				logger.Errorf("Could not gracefully shutdown controller data server: %v\n", err)
+			} else {
+				logger.Errorf("Gracefully shuting down controller data server")
+			}
+		}()
+		logger.Infof("running default backend server on :%d", builder.osArgs.DefaultBackendPort)
+		err := server.ListenAndServe(":" + strconv.Itoa(builder.osArgs.DefaultBackendPort))
+		logger.Error(err)
+	}()
+}
+
 func requestHandler(ctx *fasthttp.RequestCtx) {
 	ctx.SetStatusCode(fasthttp.StatusOK)
 	ctx.Response.Header.Set("X-HAProxy-Ingress-Controller", "healtz")

pkg/controller/global.go

@@ -166,7 +166,7 @@ func (c *HAProxyController) handleDefaultService() (reload bool) {
 	if err != nil {
 		logger.Errorf("default service: %s", err)
 	}
-	return false
+	return reload
 }
 
 // handleDefaultServicePort configures local HAProy default backend provided via cli param "default-backend-port"
@@ -201,7 +201,7 @@ func (c *HAProxyController) handleDefaultServicePort() (reload bool) {
 	if err != nil {
 		logger.Errorf("default service port: %s", err)
 	}
-	return true
+	return reload
 }
 
 // handleDefaultCert configures default/fallback HAProxy certificate to use for client HTTPS requests.