CLEANUP/MINOR: setup: remove duplicate condition

binlab · mjuraga · commit fef4d8991239 · 2022-05-31T09:37:11.000+02:00
diff --git a/configure_data_plane.go b/configure_data_plane.go
@@ -123,14 +123,6 @@ func configureAPI(api *operations.DataPlaneAPI) http.Handler {
 			haproxyOptions.MasterRuntime = strings.Replace(masterRuntime, "unix@", "", 1)
 		}
 	}
-	// Override options with env variables
-	if os.Getenv("HAPROXY_MWORKER") == "1" {
-		mWorker = true
-		masterRuntime := os.Getenv("HAPROXY_MASTER_CLI")
-		if misc.IsUnixSocketAddr(masterRuntime) {
-			haproxyOptions.MasterRuntime = strings.Replace(masterRuntime, "unix@", "", 1)
-		}
-	}
 
 	if cfgFiles := os.Getenv("HAPROXY_CFGFILES"); cfgFiles != "" {
 		m := map[string]bool{"configuration": false}

Original file line number	Diff line number	Diff line change
`@@ -123,14 +123,6 @@ func configureAPI(api *operations.DataPlaneAPI) http.Handler {`
`123`	`123`	`haproxyOptions.MasterRuntime = strings.Replace(masterRuntime, "unix@", "", 1)`
`124`	`124`	`}`
`125`	`125`	`}`
`126`		`- // Override options with env variables`
`127`		`- if os.Getenv("HAPROXY_MWORKER") == "1" {`
`128`		`- mWorker = true`
`129`		`- masterRuntime := os.Getenv("HAPROXY_MASTER_CLI")`
`130`		`- if misc.IsUnixSocketAddr(masterRuntime) {`
`131`		`- haproxyOptions.MasterRuntime = strings.Replace(masterRuntime, "unix@", "", 1)`
`132`		`- }`
`133`		`- }`
`134`	`126`
`135`	`127`	`if cfgFiles := os.Getenv("HAPROXY_CFGFILES"); cfgFiles != "" {`
`136`	`128`	`m := map[string]bool{"configuration": false}`