diff --git a/Abstracts/TraitServer.php b/Abstracts/TraitServer.php index fd4a546..01a0375 100644 --- a/Abstracts/TraitServer.php +++ b/Abstracts/TraitServer.php @@ -5,12 +5,12 @@ namespace Kiri\Server\Abstracts; use Exception; use Kiri; use Swoole\Http\Server as HServer; -use Swoole\Process; use Swoole\Server; -use Kiri\Server\Processes\BaseProcess; +use Kiri\Server\Processes\AbstractProcess; use Kiri\Server\Constant; use Kiri\Server\Config; use Swoole\WebSocket\Server as WServer; +use Swoole\Process; trait TraitServer { @@ -23,11 +23,11 @@ trait TraitServer /** - * @param string|array|BaseProcess $class + * @param string|array|AbstractProcess $class * @return void * @throws */ - public function addProcess(string|array|BaseProcess $class): void + public function addProcess(string|array|AbstractProcess $class): void { if (!is_array($class)) { $class = [$class]; @@ -37,7 +37,7 @@ trait TraitServer $name = Kiri::getDi()->get($name); } if (isset($this->_process[$name->getName()])) { - throw new Exception('Process(' . $name->getName() . ') is exists.'); + throw new Exception('AbstractProcess(' . $name->getName() . ') is exists.'); } $process = $this->genProcess($name); if ($name->isEnableQueue()) { @@ -49,10 +49,10 @@ trait TraitServer /** - * @param BaseProcess $name + * @param AbstractProcess $name * @return Process */ - private function genProcess(BaseProcess $name): Process + private function genProcess(AbstractProcess $name): Process { return new Process(function (Process $process) use ($name) { $process->name('[' . \config('id','system-service') . '].' . $name->getName()); @@ -66,7 +66,7 @@ trait TraitServer /** * @param string $name - * @return Process|null + * @return AbstractProcess|null */ public function getProcess(string $name): ?Process { diff --git a/Handler/OnServerWorker.php b/Handler/OnServerWorker.php index 6523cfa..84d449e 100644 --- a/Handler/OnServerWorker.php +++ b/Handler/OnServerWorker.php @@ -77,7 +77,7 @@ class OnServerWorker extends Kiri\Server\Abstracts\Server */ protected function processName(Server $server, string $prefix): void { - Kiri::setProcessName(sprintf($prefix . ' Process[%d].%d', $server->worker_pid, $server->worker_id)); + Kiri::setProcessName(sprintf($prefix . ' AbstractProcess[%d].%d', $server->worker_pid, $server->worker_id)); } diff --git a/HotReload.php b/HotReload.php index 4c5133c..47e6ce8 100644 --- a/HotReload.php +++ b/HotReload.php @@ -3,15 +3,16 @@ declare(strict_types=1); namespace Kiri\Server; +use Kiri; use Kiri\Di\Context; use Kiri\Router\Router; use Kiri\Server\Events\OnWorkerStart; -use Kiri\Server\Processes\BaseProcess; +use Kiri\Server\Processes\AbstractProcess; use Swoole\Coroutine; use Swoole\Event; use Swoole\Process; -class HotReload extends BaseProcess +class HotReload extends AbstractProcess { /** @@ -308,7 +309,7 @@ class HotReload extends BaseProcess */ public function trigger_reload(): void { - \Kiri::getLogger()->failure('Wait trigger server Reload' . PHP_EOL); + Kiri::getLogger()->failure('Wait trigger server Reload' . PHP_EOL); di(ServerInterface::class)->reload(false); } diff --git a/Processes/BaseProcess.php b/Processes/AbstractProcess.php similarity index 92% rename from Processes/BaseProcess.php rename to Processes/AbstractProcess.php index 0f74da3..6601f54 100644 --- a/Processes/BaseProcess.php +++ b/Processes/AbstractProcess.php @@ -9,7 +9,7 @@ use Swoole\Coroutine; /** * */ -abstract class BaseProcess implements OnProcessInterface +abstract class AbstractProcess implements OnProcessInterface { private bool $stop = false; @@ -122,7 +122,7 @@ abstract class BaseProcess implements OnProcessInterface { $this->stop = true; $value = Context::get('waite:process:message'); - \Kiri::getLogger()->alert('Process ' . $this->getName() . ' stop'); + \Kiri::getLogger()->alert('AbstractProcess ' . $this->getName() . ' stop'); if (!is_null($value) && Coroutine::exists((int)$value)) { Coroutine::cancel((int)$value); } diff --git a/Processes/OnProcessInterface.php b/Processes/OnProcessInterface.php index 6002794..3cd235a 100644 --- a/Processes/OnProcessInterface.php +++ b/Processes/OnProcessInterface.php @@ -8,7 +8,7 @@ use Swoole\Process; /** - * Interface BaseProcess + * Interface AbstractProcess * @package Contract */ interface OnProcessInterface