BUG/MINOR: fix missing pidfile reconfiguration when in external mode

ivanmatmati · ivanmatmati · commit 3d8a6874e328 · 2022-06-02T11:56:48.000+02:00
diff --git a/pkg/haproxy/main.go b/pkg/haproxy/main.go
@@ -41,6 +41,7 @@ func New(osArgs utils.OSArgs, env env.Env, cfgFile []byte, p process.Process, cl
 
 	if osArgs.External {
 		cfgFile = []byte(strings.ReplaceAll(string(cfgFile), "/var/run/haproxy-runtime-api.sock", h.RuntimeSocket))
+		cfgFile = []byte(strings.ReplaceAll(string(cfgFile), "pidfile /var/run/haproxy.pid", "pidfile "+h.PIDFile))
 	}
 
 	err = renameio.WriteFile(h.MainCFGFile, cfgFile, 0o755)

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ func New(osArgs utils.OSArgs, env env.Env, cfgFile []byte, p process.Process, cl`
`41`	`41`
`42`	`42`	`if osArgs.External {`
`43`	`43`	`cfgFile = []byte(strings.ReplaceAll(string(cfgFile), "/var/run/haproxy-runtime-api.sock", h.RuntimeSocket))`
	`44`	`+ cfgFile = []byte(strings.ReplaceAll(string(cfgFile), "pidfile /var/run/haproxy.pid", "pidfile "+h.PIDFile))`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`err = renameio.WriteFile(h.MainCFGFile, cfgFile, 0o755)`