nicer name

Author: henderkes

caddy/caddy.go

@@ -7,7 +7,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/davecgh/go-spew/spew"
 	"net/http"
 	"path/filepath"
 	"strconv"
@@ -125,8 +124,6 @@ func (f *FrankenPHPApp) Start() error {
 		return err
 	}
 
-	caddy.Log().Warn(fmt.Sprintf("FrankenPHPApp started with workers: %s", spew.Sdump(append(f.Workers, sharedState.Workers...))))
-
 	return nil
 }
 
@@ -465,8 +462,6 @@ func (f *FrankenPHPModule) ServeHTTP(w http.ResponseWriter, r *http.Request, _ c
 		workerNames[i] = w.Name
 	}
 
-	caddy.Log().Info(fmt.Sprintf("ServeHTTP module has workers: %s", spew.Sdump(f.Workers)))
-
 	fr, err := frankenphp.NewRequestWithContext(
 		r,
 		documentRootOption,
@@ -632,7 +627,7 @@ func (f *FrankenPHPModule) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 							envString += k + "=" + v + ","
 						}
 						envString = strings.TrimSuffix(envString, ",")
-						wc.Name += "env:" + envString + "_"
+						wc.Name += "env:" + envString + "_" + wc.FileName
 					}
 				}
 				if wc.Name != "" && !strings.HasPrefix(wc.Name, "m#") {
@@ -644,8 +639,6 @@ func (f *FrankenPHPModule) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 		}
 	}
 
-	caddy.Log().Warn(fmt.Sprintf("FrankenPHPModule UnmarshalCaddyfile with workers: %s", spew.Sdump(f.Workers)))
-
 	return nil
 }
 

frankenphp.go

@@ -32,7 +32,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/davecgh/go-spew/spew"
 	"io"
 	"net/http"
 	"os"
@@ -293,8 +292,6 @@ func Init(options ...Option) error {
 		return err
 	}
 
-	logger.Warn(fmt.Sprintf("FrankenPHP initialised workers: %s", spew.Sdump(opt.workers)))
-
 	initAutoScaling(mainThread)
 
 	if c := logger.Check(zapcore.InfoLevel, "FrankenPHP started 🐘"); c != nil {
@@ -407,13 +404,10 @@ func ServeHTTP(responseWriter http.ResponseWriter, request *http.Request) error
 		return nil
 	}
 
-	workerNames := append(fc.workerNames, "")
-	fc.logger.Warn(fmt.Sprintf("ServeHTTP Worker Names: %s", spew.Sdump(workerNames)))
+	workerNames := append(fc.workerNames, fc.scriptFilename)
 	for _, workerName := range workerNames {
 		// Detect if a worker is available to handle this request
-		workername := workerName + fc.scriptFilename
-		if worker := getWorkerForName(workername); worker != nil {
-			fc.logger.Info(fmt.Sprintf("Found worker: %s", workername))
+		if worker := getWorkerForName(workerName); worker != nil {
 			worker.handleRequest(fc)
 			return nil
 		}

worker.go

@@ -85,7 +85,7 @@ func newWorker(o workerOpt) (*worker, error) {
 
 	key := absFileName
 	if strings.HasPrefix(o.name, "m#") {
-		key = o.name + absFileName
+		key = o.name
 	}
 	if wrk := getWorkerForName(key); wrk != nil {
 		return wrk, nil