ivampiresp/Lae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改进 集群

Browse Source
This commit is contained in:
iVampireSP.com 2023-02-08 14:18:58 +08:00
parent 9fb07ab438
commit 29f7cdda9c
No known key found for this signature in database
GPG Key ID: 2F7B001CA27A8132
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Console/Commands/Cluster/Log.php
View File

@ -40,18 +40,17 @@ private function format(string $event, array $message = [])
{ {
$status = $this->switch($event, $message['data']); $status = $this->switch($event, $message['data']);
if (! $status) { if (!$status) {
return; return;
} }
$message = "[{$message['node']['type']}] {$message['node']['id']}:$event: ".$status; $message = "[{$message['node']['type']}] {$message['node']['id']}:$event: " . $status;
$this->info($message); $this->info($message);
} }
public function switch($event, $message = []): string|null public function switch($event, $message = []): string|null
{ {
// var_dump($event, $message);
$events = [ $events = [
'node.ok' => '此节点初始化成功，并且已经加入集群。', 'node.ok' => '此节点初始化成功，并且已经加入集群。',
'node.online' => '此节点已经上线。', 'node.online' => '此节点已经上线。',
@ -62,19 +61,19 @@ public function switch($event, $message = []): string|null
'config.synced' => '我已下载配置文件。', 'config.synced' => '我已下载配置文件。',
'edge.deployed' => '已成功根据集群节点生成配置文件并应用。', 'edge.deployed' => '已成功根据集群节点生成配置文件并应用。',
'edge.launched' => '边缘节点成功启动。', 'edge.launched' => '边缘节点成功启动。',
'edge.error' => $message['message'] ?? '未知错误', 'edge.error' => fn($message) => $message['message'] ?? '未知错误',
'cluster.restart.web' => '正在重启 web 服务。', 'cluster.restart.web' => '正在重启 web 服务。',
'cluster.restart.all' => '正在重启 整个 服务。', 'cluster.restart.all' => '正在重启 整个 服务。',
'cluster.restarted.web' => 'Web 重启好了。', 'cluster.restarted.web' => 'Web 重启好了。',
'cluster.restarted.all' => '整个 重启好了。', 'cluster.restarted.all' => '整个 重启好了。',
'cluster.deployed' => '集群配置文件已经部署。', 'cluster.deployed' => '集群配置文件已经部署。',
'cluster.deployed.error' => $message['message'] ?? '未知错误', 'cluster.deployed.error' => fn($message) => $message['message'] ?? '未知错误',
'cluster.deployed.ok' => '集群配置文件部署成功。', 'cluster.deployed.ok' => '集群配置文件部署成功。',
'http.incoming' => fn ($message) => $this->handleIncomingRequest($message), 'http.incoming' => fn($message) => $this->handleIncomingRequest($message),
'http.outgoing' => fn ($message) => $this->handleOutgoingRequest($message), 'http.outgoing' => fn($message) => $this->handleOutgoingRequest($message),
]; ];
$resp = $events[$event]; $resp = $events[$event] ?? null;
// if resp is callable // if resp is callable
if (is_callable($resp)) { if (is_callable($resp)) {

2
app/Support/ClusterSupport.php
View File

@ -77,7 +77,7 @@ public static function listen(string|array $events, callable $callback, bool $ig
ini_set('default_socket_timeout', -1); ini_set('default_socket_timeout', -1);
Redis::subscribe('cluster_ready', function ($message) use ($events, $callback, $ignore_self) { Redis::subscribe('cluster_ready', function ($message) use ($events, $callback, $ignore_self) {
echo $message; // echo $message;
$message = json_decode($message, true); $message = json_decode($message, true);
if ($ignore_self && $message['node']['id'] === config('settings.node.id')) { if ($ignore_self && $message['node']['id'] === config('settings.node.id')) {