Extract createFIFOByPath() func from startSlowlogProxyForPool()

Author: anahan

cmd/docker-fpm-wrapper/pipe.go

@@ -0,0 +1,40 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	"golang.org/x/sys/unix"
+)
+
+func createFIFOByPath(fPath string) (*os.File, error) {
+	if err := os.Remove(fPath); err != nil && !os.IsNotExist(err) {
+		return nil, fmt.Errorf("can't remove file: %w", err)
+	}
+
+	if err := unix.Mkfifo(fPath, 0666); err != nil {
+		return nil, fmt.Errorf("can't create linux pipe: %w", err)
+	}
+
+	fifoF, err := os.OpenFile(fPath, os.O_RDWR, os.ModeNamedPipe)
+	if err != nil {
+		return nil, fmt.Errorf("can't open pipe: %w", err)
+	}
+
+	return fifoF, nil
+}
+
+func createFIFOByPathCtx(ctx context.Context, fPath string) (*os.File, error) {
+	f, err := createFIFOByPath(fPath)
+	if err != nil {
+		return nil, err
+	}
+
+	go func() {
+		<-ctx.Done()
+		_ = f.Close()
+	}()
+
+	return f, nil
+}

cmd/docker-fpm-wrapper/slowlog.go

@@ -2,35 +2,19 @@ package main
 
 import (
 	"context"
-	"fmt"
-	"os"
 
 	"go.uber.org/zap"
-	"golang.org/x/sys/unix"
 
 	"github.com/code-tool/docker-fpm-wrapper/internal/zapx"
 	"github.com/code-tool/docker-fpm-wrapper/pkg/phpfpm"
 )
 
 func startSlowlogProxyForPool(ctx context.Context, pool phpfpm.Pool, out chan phpfpm.SlowlogEntry) error {
-	if err := os.Remove(pool.SlowlogPath); err != nil && !os.IsNotExist(err) {
-		return fmt.Errorf("can't remove slowlog file: %w", err)
-	}
-
-	if err := unix.Mkfifo(pool.SlowlogPath, 0666); err != nil {
-		return fmt.Errorf("can't create linux pipe for slowlog: %w", err)
-	}
-
-	fifoF, err := os.OpenFile(pool.SlowlogPath, os.O_RDWR, os.ModeNamedPipe)
+	fifoF, err := createFIFOByPathCtx(ctx, pool.SlowlogPath)
 	if err != nil {
-		return fmt.Errorf("can't open pipe with error: %w", err)
+		return err
 	}
 
-	go func() {
-		<-ctx.Done()
-		_ = fifoF.Close()
-	}()
-
 	slowLogParser := phpfpm.NewSlowlogParser(pool.RequestSlowlogTraceDepth)
 	go func() {
 		// TODO probably should be logged