From 47c1ab2086b766b358b8883f96064be91484c0e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Thu, 15 Apr 2021 18:15:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HttpServer/Events/OnPipeMessage.php | 17 ++++++++--------- System/Crontab/Zookeeper.php | 5 ++--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/HttpServer/Events/OnPipeMessage.php b/HttpServer/Events/OnPipeMessage.php index e26feb34..68fa891e 100644 --- a/HttpServer/Events/OnPipeMessage.php +++ b/HttpServer/Events/OnPipeMessage.php @@ -19,20 +19,19 @@ use Swoole\Server; class OnPipeMessage extends Callback { - /** - * @param Server $server - * @param int $src_worker_id - * @param $message - * @throws Exception - */ - public function onHandler(Server $server, int $src_worker_id, $message) + /** + * @param Server $server + * @param int $src_worker_id + * @param $swollen_universalize + * @throws Exception + */ + public function onHandler(Server $server, int $src_worker_id, $swollen_universalize) { try { - $swollen_universalize = swoole_unserialize($message); match ($swollen_universalize['action'] ?? null) { 'kafka' => $this->onKafkaWorker($swollen_universalize), 'crontab' => $this->onCrontabWorker($swollen_universalize), - default => $this->onMessageWorker($server, $src_worker_id, $message) + default => $this->onMessageWorker($server, $src_worker_id, $swollen_universalize) }; } catch (\Throwable $exception) { $this->addError($exception); diff --git a/System/Crontab/Zookeeper.php b/System/Crontab/Zookeeper.php index 08c7c444..af39bfea 100644 --- a/System/Crontab/Zookeeper.php +++ b/System/Crontab/Zookeeper.php @@ -65,10 +65,9 @@ class Zookeeper extends Process */ private function dispatch($server, Redis|\Redis $redis, int $setting, $value) { - $server->sendMessage(swoole_serialize([ + $server->sendMessage([ 'action' => 'crontab', 'handler' => swoole_unserialize($redis->get('crontab:' . $value)) - ]), random_int(0, $setting - 1)); - $redis->del('crontab:' . $value); + ], random_int(0, $setting - 1)); }