From b7d0b0c3d65aec1fe20754c1ee5902cf6e7683ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Fri, 23 Jul 2021 17:54:08 +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 --- Server/Manager/ServerDefaultEvent.php | 3 --- System/Crontab/Zookeeper.php | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Server/Manager/ServerDefaultEvent.php b/Server/Manager/ServerDefaultEvent.php index a87f5b47..c12cd3c4 100644 --- a/Server/Manager/ServerDefaultEvent.php +++ b/Server/Manager/ServerDefaultEvent.php @@ -43,9 +43,6 @@ class ServerDefaultEvent extends Server */ public function onPipeMessage(\Swoole\Server $server, int $src_worker_id, mixed $message) { - if (is_null($message = unserialize($message))) { - return; - } if (!is_object($message) || !($message instanceof PipeMessage)) { return; } diff --git a/System/Crontab/Zookeeper.php b/System/Crontab/Zookeeper.php index ba13e3f8..b04e1ee8 100644 --- a/System/Crontab/Zookeeper.php +++ b/System/Crontab/Zookeeper.php @@ -74,13 +74,11 @@ class Zookeeper implements CustomProcess private function dispatch(Redis|\Redis $redis, $value) { try { - $params['action'] = 'crontab'; if (empty($handler = $redis->get('crontab:' . $value))) { return; } - $params['handler'] = swoole_unserialize($handler); $server = ServerManager::getContext()->getServer(); - $server->sendMessage($params, $this->getWorker()); + $server->sendMessage(swoole_unserialize($handler), $this->getWorker()); } catch (Throwable $exception) { logger()->addError($exception); }