This commit is contained in:
2023-08-11 02:22:29 +08:00
parent 65fa64e6b7
commit 7424554529
+5 -6
View File
@@ -14,7 +14,6 @@ use Kiri\Server\Events\OnWorkerStop;
use Kiri\Server\Abstracts\AsyncServer; use Kiri\Server\Abstracts\AsyncServer;
use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface; use Psr\Container\NotFoundExceptionInterface;
use Kiri\Server\Events\OnServerBeforeStart;
use Swoole\Timer; use Swoole\Timer;
@@ -46,6 +45,7 @@ class Server
public EventDispatch $dispatch, public EventDispatch $dispatch,
public Router $router) public Router $router)
{ {
on(OnWorkerStop::class, [Timer::class, 'clearAll'], 9999);
} }
@@ -54,9 +54,8 @@ class Server
*/ */
public function init(): void public function init(): void
{ {
on(OnWorkerStop::class, [Timer::class, 'clearAll'], 9999); on(OnWorkerStart::class, [$this, 'onWorkerName']);
on(OnWorkerStart::class, [$this, 'setWorkerName']); on(OnTaskerStart::class, [$this, 'onTaskerName']);
on(OnTaskerStart::class, [$this, 'setTaskerName']);
} }
@@ -79,7 +78,7 @@ class Server
/** /**
* @param OnWorkerStart $onWorkerStart * @param OnWorkerStart $onWorkerStart
*/ */
public function setWorkerName(OnWorkerStart $onWorkerStart): void public function onWorkerName(OnWorkerStart $onWorkerStart): void
{ {
if (!property_exists($onWorkerStart->server, 'worker_pid')) { if (!property_exists($onWorkerStart->server, 'worker_pid')) {
return; return;
@@ -94,7 +93,7 @@ class Server
/** /**
* @param OnTaskerStart $onWorkerStart * @param OnTaskerStart $onWorkerStart
*/ */
public function setTaskerName(OnTaskerStart $onWorkerStart): void public function onTaskerName(OnTaskerStart $onWorkerStart): void
{ {
if (!property_exists($onWorkerStart->server, 'worker_pid')) { if (!property_exists($onWorkerStart->server, 'worker_pid')) {
return; return;