From ef7dc2980eda089388f5655c38d5fd27de058fed Mon Sep 17 00:00:00 2001 From: "as2252258@163.com" Date: Fri, 9 Apr 2021 03:06:50 +0800 Subject: [PATCH] modify --- HttpServer/Events/OnWorkerStart.php | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/HttpServer/Events/OnWorkerStart.php b/HttpServer/Events/OnWorkerStart.php index 07b9cddf..0ec245e6 100644 --- a/HttpServer/Events/OnWorkerStart.php +++ b/HttpServer/Events/OnWorkerStart.php @@ -53,27 +53,32 @@ class OnWorkerStart extends Callback */ public function onHandler(Server $server, int $worker_id): void { - $annotation = $this->injectLoader(); - $line = new Pipeline(); - $line->if($this->isWorker($worker_id), function ($annotation, $server, $worker_id) { - $annotation->runtime(CONTROLLER_PATH); - $annotation->runtime(APP_PATH, CONTROLLER_PATH); - $this->onWorker($server, $server->worker_id); - name($server->worker_pid, 'Worker.' . $worker_id); - }) - ->else(function ($annotation, $server, $worker_id) { + (new Pipeline()) + ->if($this->isWorker($worker_id), function ($handler, $server, $worker_id) { + $annotation = Snowflake::app()->getAnnotation(); + + $annotation->runtime(CONTROLLER_PATH); + $annotation->runtime(APP_PATH, CONTROLLER_PATH); + $handler->onWorker($server, $server->worker_id); + name($server->worker_pid, 'Worker.' . $worker_id); + }) + ->else(function ($handler, $server, $worker_id) { + $annotation = Snowflake::app()->getAnnotation(); $annotation->runtime(MODEL_PATH); - $this->onTask($server, $server->worker_id); + + $handler->onTask($server, $server->worker_id); name($server->worker_pid, 'Task.' . $worker_id); }) ->catch(function (\Throwable $throwable) { - $this->addError($throwable->getMessage()); + logger()->addError($throwable->getMessage()); }) ->before(function ($annotation, $server, $worker_id) { putenv('state=start'); putenv('worker=' . $worker_id); + + $this->injectLoader(); }) - ->exec($annotation, $server, $worker_id); + ->exec($this, $server, $worker_id); }