Jelajahi Sumber

中转节点屏蔽离线提醒

admin 7 tahun lalu
induk
melakukan
fc70e0d1ea

+ 1 - 1
app/Console/Commands/AutoJob.php

@@ -539,7 +539,7 @@ class AutoJob extends Command
     private function checkNodeStatus()
     {
         if (Helpers::systemConfig()['is_node_crash_warning']) {
-            $nodeList = SsNode::query()->where('status', 1)->get();
+            $nodeList = SsNode::query()->where('is_transit', 0)->where('status', 1)->get();
             foreach ($nodeList as $node) {
                 // 10分钟内无节点负载信息且TCP检测认为不是离线则认为是后端炸了
                 $nodeTTL = SsNodeInfo::query()->where('node_id', $node->id)->where('log_time', '>=', strtotime("-10 minutes"))->orderBy('id', 'desc')->first();

+ 1 - 1
app/Http/Controllers/AdminController.php

@@ -557,7 +557,7 @@ class AdminController extends Controller
 
             // 负载(10分钟以内)
             $node_info = SsNodeInfo::query()->where('node_id', $node->id)->where('log_time', '>=', strtotime("-10 minutes"))->orderBy('id', 'desc')->first();
-            $node->load = empty($node_info) || empty($node_info->load) ? '离线' : $node_info->load;
+            $node->load = $node->is_transit ? '' : (empty($node_info) || empty($node_info->load) ? '离线' : $node_info->load);
             $node->uptime = empty($node_info) ? 0 : seconds2time($node_info->uptime);
         }