From b6f1d8eaf7e416499f2d8c5ab4a646b70d942a76 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:52:58 +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
---
 Abstracts/BaseProcess.php          |  4 +---
 Broadcast/Message.php              |  9 ++++++---
 Broadcast/OnBroadcastInterface.php | 14 ++++++++++++++
 ProcessManager.php                 |  1 +
 4 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 Broadcast/OnBroadcastInterface.php

diff --git a/Abstracts/BaseProcess.php b/Abstracts/BaseProcess.php
index 8c75a21..10d0597 100644
--- a/Abstracts/BaseProcess.php
+++ b/Abstracts/BaseProcess.php
@@ -4,6 +4,7 @@ namespace Kiri\Server\Abstracts;
 
 
 use Kiri\Context;
+use Kiri\Server\Broadcast\OnBroadcastInterface;
 use Kiri\Server\Contract\OnProcessInterface;
 use Swoole\Coroutine;
 use Swoole\Process;
@@ -80,9 +81,6 @@ abstract class BaseProcess implements OnProcessInterface
 	}
 
 
-	abstract public function onBroadcast($message);
-
-
 	/**
 	 *
 	 */
diff --git a/Broadcast/Message.php b/Broadcast/Message.php
index 7886120..13f726d 100644
--- a/Broadcast/Message.php
+++ b/Broadcast/Message.php
@@ -7,7 +7,11 @@ use Kiri\Kiri;
 use Kiri\Server\Contract\OnPipeMessageInterface;
 use Psr\Log\LoggerInterface;
 
-class Message implements OnPipeMessageInterface
+
+/**
+ *
+ */
+class Message implements OnPipeMessageInterface, OnBroadcastInterface
 {
 
 	/**
@@ -24,8 +28,7 @@ class Message implements OnPipeMessageInterface
 	public function process(): void
 	{
 		$logger = Kiri::getDi()->get(LoggerInterface::class);
-		$logger->debug('workerId::' . env('environmental_workerId'));
-		$logger->debug($this->data . '::' . static::class);
+		$logger->debug(env('environmental') . '::' . env('environmental_workerId', 0) . '::' . $this->data);
 	}
 
 }
diff --git a/Broadcast/OnBroadcastInterface.php b/Broadcast/OnBroadcastInterface.php
new file mode 100644
index 0000000..de2103f
--- /dev/null
+++ b/Broadcast/OnBroadcastInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Kiri\Server\Broadcast;
+
+interface OnBroadcastInterface
+{
+
+
+	/**
+	 * @return void
+	 */
+	public function process(): void;
+
+}
diff --git a/ProcessManager.php b/ProcessManager.php
index 6a5bc42..d433271 100644
--- a/ProcessManager.php
+++ b/ProcessManager.php
@@ -57,6 +57,7 @@ class ProcessManager
 			if (Kiri::getPlatform()->isLinux()) {
 				$process->name($system . '(' . $customProcess->getName() . ')');
 			}
+			set_env('environmental', Kiri::PROCESS);
 			$channel = Coroutine::create(function () use ($process, $customProcess) {
 				while (!$customProcess->isStop()) {
 					$message = $process->read();