Remove WorkerModule abstraction

phpstreamserver · Sep 30, 2024 · 5824f0b · 5824f0b
1 parent 14bb52f
commit 5824f0b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 29 deletions.
diff --git a/src/Plugin/HttpServer/HttpServer.php b/src/Plugin/HttpServer/HttpServer.php
@@ -59,7 +59,7 @@ private function onWorkerStart(WorkerProcess $worker): void
             );
         }
 
-        $worker->startWorkerModule(new HttpServerModule(
+        $module = new HttpServerModule(
             listen: self::createListenList($this->listen),
             requestHandler: $requestHandler,
             middleware: $this->middleware,
@@ -70,7 +70,9 @@ private function onWorkerStart(WorkerProcess $worker): void
             connectionTimeout: $this->connectionTimeout,
             headerSizeLimit: $this->headerSizeLimit,
             bodySizeLimit: $this->bodySizeLimit,
-        ));
+        );
+
+        $module->start($worker);
     }
 
     /**

diff --git a/src/Plugin/HttpServer/HttpServerModule.php b/src/Plugin/HttpServer/HttpServerModule.php
@@ -28,10 +28,9 @@
 use Luzrain\PHPStreamServer\Plugin\HttpServer\Internal\TrafficCountingClientFactory;
 use Luzrain\PHPStreamServer\Plugin\HttpServer\Internal\TrafficCountingSocketFactory;
 use Luzrain\PHPStreamServer\Plugin\HttpServer\Middleware\StaticMiddleware;
-use Luzrain\PHPStreamServer\Plugin\WorkerModule;
 use Luzrain\PHPStreamServer\WorkerProcessInterface;
 
-final readonly class HttpServerModule implements WorkerModule
+final readonly class HttpServerModule
 {
     private const DEFAULT_TCP_BACKLOG = 65536;
 

diff --git a/src/Plugin/WorkerModule.php b/src/Plugin/WorkerModule.php
diff --git a/src/WorkerProcess.php b/src/WorkerProcess.php
@@ -16,7 +16,6 @@
 use Luzrain\PHPStreamServer\Message\ProcessDetachedEvent;
 use Luzrain\PHPStreamServer\Message\ProcessHeartbeatEvent;
 use Luzrain\PHPStreamServer\Message\ProcessSpawnedEvent;
-use Luzrain\PHPStreamServer\Plugin\WorkerModule;
 use Luzrain\PHPStreamServer\ReloadStrategy\ReloadStrategyInterface;
 use Revolt\EventLoop;
 use Revolt\EventLoop\DriverFactory;
@@ -159,11 +158,6 @@ public function detach(): void
         \gc_mem_caches();
     }
 
-    public function startWorkerModule(WorkerModule $module): void
-    {
-        $module->start($this);
-    }
-
     public function addReloadStrategy(ReloadStrategyInterface ...$reloadStrategies): void
     {
         $this->reloadStrategyTrigger->addReloadStrategy(...$reloadStrategies);

diff --git a/src/WorkerProcessInterface.php b/src/WorkerProcessInterface.php
@@ -4,8 +4,6 @@
 
 namespace Luzrain\PHPStreamServer;
 
-use Luzrain\PHPStreamServer\Plugin\WorkerModule;
-
 interface WorkerProcessInterface extends ProcessInterface
 {
     final public const RELOAD_EXIT_CODE = 100;
@@ -21,11 +19,6 @@ public function stop(int $code = 0): void;
      */
     public function reload(): void;
 
-    /**
-     * Start worker module in this worker
-     */
-    public function startWorkerModule(WorkerModule $module): void;
-
     /**
      * Count of processes
      */