add test, use getWorker(ForContext) function in frankenphp.go as well

Author: henderkes

caddy/caddy_test.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -119,6 +120,59 @@ func TestWorker(t *testing.T) {
 	wg.Wait()
 }
 
+func TestGlobalAndLocalWorker(t *testing.T) {
+	var wg sync.WaitGroup
+	testPortNum, _ := strconv.Atoi(testPort)
+	testPortTwo := strconv.Itoa(testPortNum + 1)
+	tester := caddytest.NewTester(t)
+	tester.InitServer(`
+		{
+			skip_install_trust
+			admin localhost:2999
+
+			frankenphp {
+				worker {
+					file ../testdata/worker-with-env.php
+					num 1
+					env APP_ENV global
+				}
+			}
+		}
+
+		http://localhost:`+testPort+` {
+			route {
+				php {
+					root ../testdata
+					worker {
+						file worker-with-env.php
+						num 2
+						env APP_ENV local
+					}
+				}
+			}
+		}
+
+		http://localhost:`+testPortTwo+` {
+			route {
+				php {
+					root ../testdata
+				}
+			}
+		}
+		`, "caddyfile")
+
+	for i := 0; i < 100; i++ {
+		wg.Add(1)
+
+		go func(i int) {
+			tester.AssertGetResponse("http://localhost:"+testPort+"/worker-with-env.php", http.StatusOK, "Worker has APP_ENV=local")
+			tester.AssertGetResponse("http://localhost:"+testPortTwo+"/worker-with-env.php", http.StatusOK, "Worker has APP_ENV=global")
+			wg.Done()
+		}(i)
+	}
+	wg.Wait()
+}
+
 func TestEnv(t *testing.T) {
 	tester := caddytest.NewTester(t)
 	tester.InitServer(`

frankenphp.go

@@ -405,19 +405,13 @@ func ServeHTTP(responseWriter http.ResponseWriter, request *http.Request) error
 	}
 
 	// Detect if a worker is available to handle this request
-	// Look for a worker with matching moduleID or a global worker (moduleID == 0)
-	if workersList, ok := workers[fc.scriptFilename]; ok {
-		for _, worker := range workersList {
-			if worker.moduleID == 0 || worker.moduleID == fc.moduleID {
-				worker.handleRequest(fc)
-				return nil
-			}
-		}
+	if worker := getWorkerForContext(fc); worker != nil {
+		worker.handleRequest(fc)
+	} else {
+		// If no worker was available, send the request to non-worker threads
+		handleRequestWithRegularPHPThreads(fc)
 	}
 
-	// If no worker was available, send the request to non-worker threads
-	handleRequestWithRegularPHPThreads(fc)
-
 	return nil
 }
 

scaling.go

@@ -130,19 +130,6 @@ func scaleRegularThread() {
 	autoScaledThreads = append(autoScaledThreads, thread)
 }
 
-func getWorker(fc *frankenPHPContext) *worker {
-	// if the request has been stalled long enough, scale
-	if workersList, ok := workers[fc.scriptFilename]; ok {
-		// Look for a worker with matching moduleID or a global worker (moduleID == 0)
-		for _, worker := range workersList {
-			if worker.moduleID == 0 || worker.moduleID == fc.moduleID {
-				return worker
-			}
-		}
-	}
-	return nil
-}
-
 func startUpscalingThreads(maxScaledThreads int, scale chan *frankenPHPContext, done chan struct{}) {
 	for {
 		scalingMu.Lock()
@@ -173,7 +160,7 @@ func startUpscalingThreads(maxScaledThreads int, scale chan *frankenPHPContext,
 			}
 
 			// if the request has been stalled long enough, scale
-			if worker := getWorker(fc); worker != nil {
+			if worker := getWorkerForContext(fc); worker != nil {
 				scaleWorkerThread(worker)
 			} else {
 				scaleRegularThread()

testdata/worker-with-env.php

@@ -0,0 +1,11 @@
+<?php
+
+$i = 0;
+$env = $_SERVER['APP_ENV'];
+do {
+    $ok = frankenphp_handle_request(function () use ($i, $env): void {
+        echo "Worker has APP_ENV=$env";
+    });
+
+    $i++;
+} while ($ok);

worker.go

@@ -70,6 +70,18 @@ func initWorkers(opt []workerOpt) error {
 	return nil
 }
 
+func getWorkerForContext(fc *frankenPHPContext) *worker {
+	if workersList, ok := workers[fc.scriptFilename]; ok {
+		// Look for a worker with matching moduleID or a global worker (moduleID == 0)
+		for _, worker := range workersList {
+			if worker.moduleID == 0 || worker.moduleID == fc.moduleID {
+				return worker
+			}
+		}
+	}
+	return nil
+}
+
 func newWorker(o workerOpt) (*worker, error) {
 	absFileName, err := fastabs.FastAbs(o.fileName)
 	if err != nil {