Do not start error_log proxy if syslog passed as target

anahan · anahan · commit 5c73f546c4f4 · 2023-04-24T13:55:23.000+02:00
diff --git a/cmd/docker-fpm-wrapper/main.go b/cmd/docker-fpm-wrapper/main.go
@@ -72,7 +72,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	if false == cfg.FpmNoErrlogProxy {
+	if false == cfg.FpmNoErrlogProxy && fpmConfig.ErrorLog != "syslog" {
 		if err := startErrLogProxy(ctx, log.Named("php-fpm"), fpmConfig.ErrorLog); err != nil {
 			log.Error("can't start err_log proxy", zap.String("path", fpmConfig.ErrorLog), zap.Error(err))
 			os.Exit(1)

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ func main() {`
`72`	`72`	`os.Exit(1)`
`73`	`73`	`}`
`74`	`74`
`75`		`- if false == cfg.FpmNoErrlogProxy {`
	`75`	`+ if false == cfg.FpmNoErrlogProxy && fpmConfig.ErrorLog != "syslog" {`
`76`	`76`	`if err := startErrLogProxy(ctx, log.Named("php-fpm"), fpmConfig.ErrorLog); err != nil {`
`77`	`77`	`log.Error("can't start err_log proxy", zap.String("path", fpmConfig.ErrorLog), zap.Error(err))`
`78`	`78`	`os.Exit(1)`