admin/Xboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(api): 修复墙检测任务超时占用与状态展示

Browse Source 
为超过 5 分钟未领取或未上报的 pending/checking
任务自动标记失败，避免长期占用 active 状态并阻塞新检测

同时区分前端“等待节点领取”和“检测中”展示，
补充跳过原因提示，并更新相关测试与文档
This commit is contained in:
yinjianm
2026-04-28 01:44:07 +08:00
parent ff50030364
commit 329d52f89f
7 changed files with 104 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Unit/ServerGfwCheckServiceTest.php
+17 -2
View File
@@ -16,6 +16,7 @@ class ServerGfwCheckServiceTest extends TestCase
{
$eligible = $this->makeServer(['name' => 'eligible-parent']);
$active = $this->makeServer(['name' => 'active-parent']);
$stale = $this->makeServer(['name' => 'stale-parent']);
$this->makeServer([
'name' => 'disabled-parent',
'gfw_check_enabled' => false,
@@ -29,17 +30,31 @@ class ServerGfwCheckServiceTest extends TestCase
'server_id' => $active->id,
'status' => ServerGfwCheck::STATUS_PENDING,
]);
$staleCheck = ServerGfwCheck::create([
'server_id' => $stale->id,
'status' => ServerGfwCheck::STATUS_PENDING,
]);
$staleCheck->forceFill([
'created_at' => now()->subMinutes(10),
'updated_at' => now()->subMinutes(10),
])->save();
$result = app(ServerGfwCheckService::class)->startAutomaticChecks();
$this->assertSame(2, $result['total']);
$this->assertSame(3, $result['total']);
$this->assertSame(1, $result['active']);
$this->assertSame([$eligible->id], array_column($result['started'], 'id'));
$this->assertSame(1, $result['expired']);
$this->assertSame([$eligible->id, $stale->id], array_column($result['started'], 'id'));
$this->assertCount(1, $result['skipped']);
$this->assertDatabaseHas('server_gfw_checks', [
'server_id' => $eligible->id,
'status' => ServerGfwCheck::STATUS_PENDING,
]);
$this->assertDatabaseHas('server_gfw_checks', [
'id' => $staleCheck->id,
'status' => ServerGfwCheck::STATUS_FAILED,
'error_message' => '墙检测任务超时：节点端未领取或未上报结果',
]);
}
public function test_report_result_hides_blocked_nodes_and_restores_only_auto_hidden_nodes(): void