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 @@ +isLinux()) { $process->name($system . '(' . $customProcess->getName() . ')'); } + set_env('environmental', Kiri::PROCESS); $channel = Coroutine::create(function () use ($process, $customProcess) { while (!$customProcess->isStop()) { $message = $process->read();