implement suggestions as far as possible

Author: henderkes

context.go

@@ -40,6 +40,7 @@ func fromContext(ctx context.Context) (fctx *frankenPHPContext, ok bool) {
 	return
 }
 
+// NewFrankenPHPContext parses out the correct filename and context to pass to NewRequestWithExistingContext
 func NewFrankenPHPContext(r *http.Request, opts ...RequestOption) (string, *frankenPHPContext, error) {
 	fc := &frankenPHPContext{
 		done:      make(chan interface{}),
@@ -94,22 +95,21 @@ func NewFrankenPHPContext(r *http.Request, opts ...RequestOption) (string, *fran
 	return fc.scriptFilename, fc, nil
 }
 
+// NewRequestWithExistingContext wraps an http request with an existing FrankenPHP request context.
+func NewRequestWithExistingContext(r *http.Request, fc *frankenPHPContext) *http.Request {
+	c := context.WithValue(r.Context(), contextKey, fc)
+
+	return r.WithContext(c)
+}
+
 // NewRequestWithContext creates a new FrankenPHP request context.
 func NewRequestWithContext(r *http.Request, opts ...RequestOption) (*http.Request, error) {
 	_, fc, err2 := NewFrankenPHPContext(r, opts...)
 	if err2 != nil {
 		return nil, err2
 	}
-	c := context.WithValue(r.Context(), contextKey, fc)
-
-	return r.WithContext(c), nil
-}
-
-// NewRequestWithExistingContext wraps an http request with an existing FrankenPHP request context.
-func NewRequestWithExistingContext(r *http.Request, fc *frankenPHPContext) (*http.Request, error) {
-	c := context.WithValue(r.Context(), contextKey, fc)
 
-	return r.WithContext(c), nil
+	return NewRequestWithExistingContext(r, fc), nil
 }
 
 func newDummyContext(requestPath string, opts ...RequestOption) (*frankenPHPContext, error) {

frankenphp.go

@@ -404,12 +404,8 @@ func ServeHTTP(responseWriter http.ResponseWriter, request *http.Request) error
 		return nil
 	}
 
-	workerName := fc.workerName
-	if workerName == "" {
-		workerName = fc.scriptFilename
-	}
 	// Detect if a worker is available to handle this request
-	if worker := getWorkerForName(workerName); worker != nil {
+	if worker, ok := workers[getWorkerKey(fc.workerName, fc.scriptFilename)]; ok {
 		worker.handleRequest(fc)
 		return nil
 	}

scaling.go

@@ -160,7 +160,7 @@ func startUpscalingThreads(maxScaledThreads int, scale chan *frankenPHPContext,
 			}
 
 			// if the request has been stalled long enough, scale
-			if worker := getWorkerForName(fc.scriptFilename); worker != nil {
+			if worker, ok := workers[getWorkerKey(fc.workerName, fc.scriptFilename)]; ok {
 				scaleWorkerThread(worker)
 			} else {
 				scaleRegularThread()

worker.go

@@ -67,11 +67,12 @@ func initWorkers(opt []workerOpt) error {
 	return nil
 }
 
-func getWorkerForName(name string) *worker {
-	if wrk, ok := workers[name]; ok {
-		return wrk
+func getWorkerKey(name string, filename string) string {
+	key := filename
+	if strings.HasPrefix(name, "m#") {
+		key = name
 	}
-	return nil
+	return key
 }
 
 func newWorker(o workerOpt) (*worker, error) {
@@ -80,11 +81,8 @@ func newWorker(o workerOpt) (*worker, error) {
 		return nil, fmt.Errorf("worker filename is invalid %q: %w", o.fileName, err)
 	}
 
-	key := absFileName
-	if strings.HasPrefix(o.name, "m#") {
-		key = o.name
-	}
-	if wrk := getWorkerForName(key); wrk != nil {
+	key := getWorkerKey(o.name, absFileName)
+	if wrk, ok := workers[key]; ok {
 		return wrk, nil
 	}