From 671574384316c1de912b28b0f255bc3bdf9a808b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Tue, 31 May 2022 11:54:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RpcJsonp.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/RpcJsonp.php b/RpcJsonp.php index 83e9a17..a455e48 100644 --- a/RpcJsonp.php +++ b/RpcJsonp.php @@ -28,6 +28,7 @@ use Kiri\Server\Events\OnWorkerStart; use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerInterface; use Psr\Container\NotFoundExceptionInterface; +use Kiri\Consul\Catalog\Catalog; use Psr\Http\Message\ServerRequestInterface; use ReflectionException; use Swoole\Coroutine; @@ -95,16 +96,14 @@ class RpcJsonp extends Component implements OnConnectInterface, OnReceiveInterfa */ public function onBeforeShutdown(OnBeforeShutdown $beforeShutdown): void { - $agent = $this->container->get(Agent::class); + $agent = $this->container->get(Catalog::class); $value = Config::get("rpc.consul", []); if (empty($value)) { return; } $this->logger->debug("disconnect consul."); - - $agent->service->deregister($value['ID']); - $agent->checks->deregister($value['Check']['CheckId']); + $agent->deregister(["node" => $value['ID']]); }