Add logger to fpm process mngr

Author: anahan

cmd/docker-fpm-wrapper/main.go

@@ -87,7 +87,7 @@ func main() {
 	}
 
 	fpmProcess := phpfpm.
-		NewProcess(cfg.FpmPath, cfg.FpmConfigPath, os.Stdout, syncStderr, cfg.ShutdownDelay, env, findFpmArgs()...)
+		NewProcess(log, cfg.FpmPath, cfg.FpmConfigPath, os.Stdout, syncStderr, cfg.ShutdownDelay, env, findFpmArgs()...)
 
 	if err = fpmProcess.Start(); err != nil {
 		log.Fatal("Can't start php-fpm", zap.Error(err))

pkg/phpfpm/process.go

@@ -1,19 +1,25 @@
 package phpfpm
 
 import (
+	"errors"
 	"io"
 	"os"
 	"os/exec"
 	"syscall"
 	"time"
+
+	"go.uber.org/zap"
 )
 
 type Process struct {
+	log *zap.Logger
+
 	cmd           *exec.Cmd
 	shutdownDelay time.Duration
 }
 
 func NewProcess(
+	log *zap.Logger,
 	fpmPath string, fpmConfigPath string,
 	stdout io.Writer, stderr io.Writer,
 	shutdownDelay time.Duration,
@@ -29,7 +35,7 @@ func NewProcess(
 	cmd.Args = append(cmd.Args, "--nodaemonize")
 	cmd.Args = append(cmd.Args, "--fpm-config", fpmConfigPath)
 
-	return &Process{cmd: cmd, shutdownDelay: shutdownDelay}
+	return &Process{log: log, cmd: cmd, shutdownDelay: shutdownDelay}
 }
 
 func (p *Process) Start() error {
@@ -49,7 +55,9 @@ func (p *Process) HandleSignal(signalCh chan os.Signal) {
 			sig = syscall.SIGQUIT
 		}
 
-		p.cmd.Process.Signal(sig)
+		if err := p.cmd.Process.Signal(sig); err != nil {
+			p.log.Error("Failed to send signal to process", zap.Stringer("signal", sig), zap.Error(err))
+		}
 	}
 }
 
@@ -59,7 +67,8 @@ func (p *Process) Wait(errCh chan<- error) int {
 		return 0
 	}
 
-	exitErr, ok := err.(*exec.ExitError)
+	var exitErr *exec.ExitError
+	ok := errors.As(err, &exitErr)
 	if !ok {
 		errCh <- err
 		return -1

pkg/phpfpm/process_test.go

@@ -5,13 +5,14 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"go.uber.org/zap"
 )
 
 func TestNewProcess(t *testing.T) {
 	stdout := bytes.NewBufferString("")
 	stderr := bytes.NewBufferString("")
 
-	p := NewProcess("echo", "configpath", stdout, stderr, 0, []string{}, "-n")
+	p := NewProcess(zap.NewNop(), "echo", "configpath", stdout, stderr, 0, []string{}, "-n")
 	assert.NoError(t, p.Start())
 
 	errCh := make(chan error, 1)