Skip to content

Commit c20056e

Browse files
author
anahan
committed
Make similar func similar by args
1 parent da3b5b7 commit c20056e

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

cmd/docker-fpm-wrapper/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func main() {
7777
}
7878

7979
if !cfg.FpmSlowlogProxyDisabled {
80-
if err = startSlowlogProxies(ctx, fpmConfig, log); err != nil {
80+
if err = startSlowlogProxies(ctx, log.Named("php-fpm"), fpmConfig.Pools); err != nil {
8181
log.Fatal("Can't start slowlog proxies", zap.Error(err))
8282
os.Exit(1)
8383
}

cmd/docker-fpm-wrapper/slowlog.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func startSlowlogProxyForPool(ctx context.Context, pool phpfpm.Pool, out chan ph
2424
return nil
2525
}
2626

27-
func startSlowlogProxies(ctx context.Context, fpmConfig phpfpm.Config, log *zap.Logger) error {
27+
func startSlowlogProxies(ctx context.Context, log *zap.Logger, pools []phpfpm.Pool) error {
2828
outCh := make(chan phpfpm.SlowlogEntry)
2929
go func() {
3030
slowlogEnc := zapx.NewSlowlogEncoder()
@@ -33,15 +33,15 @@ func startSlowlogProxies(ctx context.Context, fpmConfig phpfpm.Config, log *zap.
3333
case <-ctx.Done():
3434
return
3535
case entry := <-outCh:
36-
if ce := log.Check(zap.WarnLevel, "slowlog detected"); ce != nil {
36+
if ce := log.Check(zap.WarnLevel, "slowlog"); ce != nil {
3737
ce.Time = entry.CreatedAt
3838
ce.Write(slowlogEnc.Encode(entry)...)
3939
}
4040
}
4141
}
4242
}()
4343

44-
for _, pool := range fpmConfig.Pools {
44+
for _, pool := range pools {
4545
if pool.SlowlogPath == "" {
4646
continue
4747
}

0 commit comments

Comments
 (0)