From 23110643e06d61fb69a4b9fc8a184b3fbcf897be Mon Sep 17 00:00:00 2001
From: xl <as2252258@163.com>
Date: Mon, 18 Nov 2024 16:35:37 +0800
Subject: [PATCH] eee

---
 Handler/OnServerWorker.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/Handler/OnServerWorker.php b/Handler/OnServerWorker.php
index 7521ceb..2fba8bc 100644
--- a/Handler/OnServerWorker.php
+++ b/Handler/OnServerWorker.php
@@ -6,6 +6,7 @@ use Kiri;
 use Kiri\Abstracts\CoordinatorManager;
 use Kiri\Coordinator;
 use Kiri\Core\Help;
+use Kiri\Di\Inject\Container;
 use Kiri\Events\EventDispatch;
 use Kiri\Server\Events\OnAfterWorkerStart;
 use Kiri\Server\Events\OnBeforeWorkerStart;
@@ -28,6 +29,14 @@ use function config;
 class OnServerWorker extends Kiri\Server\Abstracts\Server
 {
 
+
+    /**
+     * @var EventDispatch
+     */
+    #[Container(EventDispatch::class)]
+    public EventDispatch $dispatch;
+
+
     /**
      * @return void
      */
@@ -62,16 +71,15 @@ class OnServerWorker extends Kiri\Server\Abstracts\Server
      */
     public function onWorkerStart(Server $server, int $workerId): void
     {
-        $dispatch = Kiri::getDi()->get(EventDispatch::class);
-        $dispatch->dispatch(new OnBeforeWorkerStart($server, $workerId));
+        $this->dispatch->dispatch(new OnBeforeWorkerStart($server, $workerId));
         if ($workerId < $server->setting['worker_num']) {
             CoordinatorManager::utility(Coordinator::WORKER_START)->waite();
 
-            $dispatch->dispatch(new OnWorkerStart($server, $workerId));
+            $this->dispatch->dispatch(new OnWorkerStart($server, $workerId));
         } else {
-            $dispatch->dispatch(new OnTaskerStart($server, $workerId));
+            $this->dispatch->dispatch(new OnTaskerStart($server, $workerId));
         }
-        $dispatch->dispatch(new OnAfterWorkerStart($server, $workerId));
+        $this->dispatch->dispatch(new OnAfterWorkerStart($server, $workerId));
     }
 
 
@@ -93,6 +101,8 @@ class OnServerWorker extends Kiri\Server\Abstracts\Server
      */
     public function onWorkerStop(Server $server, int $workerId): void
     {
+        error(sprintf('Worker#%d::%d stop.',$server->worker_pid, $workerId));
+
         event(new OnWorkerStop($server, $workerId));
         Timer::clearAll();
     }
@@ -105,6 +115,8 @@ class OnServerWorker extends Kiri\Server\Abstracts\Server
      */
     public function onWorkerExit(Server $server, int $workerId): void
     {
+        error(sprintf('Worker#%d::%d exit.',$server->worker_pid, $workerId));
+
         event(new OnWorkerExit($server, $workerId));
     }