From aca8cac1a4ad5d07834cee2eae7d57243aaa2c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Wed, 12 Jan 2022 11:39:16 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=94=B9=E5=90=8D"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fdf58326
---
 Broadcast/Broadcast.php    | 3 +++
 Handler/OnServerWorker.php | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Broadcast/Broadcast.php b/Broadcast/Broadcast.php
index 68a9fb9..01f7f69 100644
--- a/Broadcast/Broadcast.php
+++ b/Broadcast/Broadcast.php
@@ -23,6 +23,9 @@ class Broadcast
 
 		$total = $server->setting['worker_num'] + $server->setting['task_worker_num'];
 		for ($i = 0; $i < $total; $i++) {
+			if ($i == env('environmental_workerId')) {
+				continue;
+			}
 			$server->sendMessage(serialize(new Message($message)), $i);
 		}
 	}
diff --git a/Handler/OnServerWorker.php b/Handler/OnServerWorker.php
index c08b823..03f42e8 100644
--- a/Handler/OnServerWorker.php
+++ b/Handler/OnServerWorker.php
@@ -4,10 +4,10 @@ namespace Kiri\Server\Handler;
 
 use Exception;
 use Kiri\Abstracts\Config;
+use Kiri\Annotation\Inject;
 use Kiri\Core\Help;
 use Kiri\Events\EventDispatch;
 use Kiri\Kiri;
-use Kiri\Annotation\Inject;
 use Kiri\Server\Events\OnAfterWorkerStart;
 use Kiri\Server\Events\OnBeforeWorkerStart;
 use Kiri\Server\Events\OnTaskerStart as OnTaskStart;
@@ -42,6 +42,7 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
 	public function onWorkerStart(Server $server, int $workerId)
 	{
 		$this->eventDispatch->dispatch(new OnBeforeWorkerStart($workerId));
+		set_env('environmental_workerId', $workerId);
 		if ($workerId < $server->setting['worker_num']) {
 			$this->eventDispatch->dispatch(new OnWorkerStart($server, $workerId));
 			$this->setProcessName(sprintf('Worker[%d].%d', $server->worker_pid, $workerId));