refactor(setup): simplify applyListenerConfigs by removing duplicate … (#868)

* refactor(setup): simplify applyListenerConfigs by removing duplicate code

---------

Signed-off-by: Elia-Renzoni <[email protected]>
Signed-off-by: James Ranson <[email protected]>
Co-authored-by: James Ranson <[email protected]>

Author: Elia-Renzoni

pkg/daemon/setup/listeners.go

@@ -130,54 +130,46 @@ func applyListenerConfigs(conf, oldConf *config.Config,
 			conf.Frontend.ConnectionsLimit, nil, router, t2, errorFunc, 0, conf.Frontend.ReadHeaderTimeout)
 	}
 
+	metricsRouter.RegisterRoute("/metrics", nil, nil,
+		false, metrics.Handler())
+	metricsRouter.RegisterRoute(conf.MgmtConfig.ConfigHandlerPath, nil, nil,
+		false, http.HandlerFunc(ch.HandlerFunc(conf)))
+
 	// if the Metrics HTTP port is configured, then set up the http listener instance
 	if conf.Metrics != nil && conf.Metrics.ListenPort > 0 &&
 		(!hasOldMC || (conf.Metrics.ListenAddress != oldConf.Metrics.ListenAddress ||
 			conf.Metrics.ListenPort != oldConf.Metrics.ListenPort)) {
 		lg.DrainAndClose("metricsListener", 0)
-		metricsRouter.RegisterRoute("/metrics", nil, nil,
-			false, metrics.Handler())
-		metricsRouter.RegisterRoute(conf.MgmtConfig.ConfigHandlerPath, nil, nil,
-			false, http.HandlerFunc(ch.HandlerFunc(conf)))
 		if conf.MgmtConfig.PprofServer == "both" || conf.MgmtConfig.PprofServer == "metrics" {
 			pprof.RegisterRoutes("metrics", metricsRouter)
 		}
 		go lg.StartListener("metricsListener",
 			conf.Metrics.ListenAddress, conf.Metrics.ListenPort,
 			conf.Frontend.ConnectionsLimit, nil, metricsRouter, nil, errorFunc, 0, conf.Frontend.ReadHeaderTimeout)
 	} else {
-		metricsRouter.RegisterRoute("/metrics", nil, nil,
-			false, metrics.Handler())
-		metricsRouter.RegisterRoute(conf.MgmtConfig.ConfigHandlerPath, nil, nil,
-			false, http.HandlerFunc(ch.HandlerFunc(conf)))
 		lg.UpdateRouter("metricsListener", metricsRouter)
 	}
 
 	mr := lm.NewRouter() // management router
+	mr.RegisterRoute(conf.MgmtConfig.ConfigHandlerPath, nil, nil,
+		false, http.HandlerFunc(ch.HandlerFunc(conf)))
+	mr.RegisterRoute(conf.MgmtConfig.ReloadHandlerPath, nil, nil,
+		false, reloadHandler)
+	mr.RegisterRoute(conf.MgmtConfig.PurgeByPathHandlerPath, nil, nil,
+		true, http.HandlerFunc(ph.PathHandler(conf.MgmtConfig.PurgeByPathHandlerPath, &o)))
+
 	// if the Management HTTP port is configured, then set up the http listener instance
 	if conf.MgmtConfig != nil && conf.MgmtConfig.ListenPort > 0 &&
 		(!hasOldRC || (conf.MgmtConfig.ListenAddress != oldConf.MgmtConfig.ListenAddress ||
 			conf.MgmtConfig.ListenPort != oldConf.MgmtConfig.ListenPort)) {
 		lg.DrainAndClose("mgmtListener", time.Millisecond*500)
-		mr.RegisterRoute(conf.MgmtConfig.ConfigHandlerPath, nil, nil,
-			false, http.HandlerFunc(ch.HandlerFunc(conf)))
-		mr.RegisterRoute(conf.MgmtConfig.ReloadHandlerPath, nil, nil,
-			false, reloadHandler)
-		mr.RegisterRoute(conf.MgmtConfig.PurgeByPathHandlerPath, nil, nil,
-			true, http.HandlerFunc(ph.PathHandler(conf.MgmtConfig.PurgeByPathHandlerPath, &o)))
 		if conf.MgmtConfig.PprofServer == "both" || conf.MgmtConfig.PprofServer == "mgmt" {
 			pprof.RegisterRoutes("mgmt", mr)
 		}
 		go lg.StartListener("mgmtListener",
 			conf.MgmtConfig.ListenAddress, conf.MgmtConfig.ListenPort,
 			conf.Frontend.ConnectionsLimit, nil, mr, nil, errorFunc, 0, conf.Frontend.ReadHeaderTimeout)
 	} else {
-		mr.RegisterRoute(conf.MgmtConfig.ConfigHandlerPath, nil, nil,
-			false, http.HandlerFunc(ch.HandlerFunc(conf)))
-		mr.RegisterRoute(conf.MgmtConfig.ReloadHandlerPath, nil, nil,
-			false, reloadHandler)
-		mr.RegisterRoute(conf.MgmtConfig.PurgeByPathHandlerPath, nil, nil,
-			true, http.HandlerFunc(ph.PathHandler(conf.MgmtConfig.PurgeByPathHandlerPath, &o)))
 		lg.UpdateRouter("mgmtListener", mr)
 	}
 }