From fac484bc45bf55aecc528a7649a062a3b305863b Mon Sep 17 00:00:00 2001 From: hamster1963 <1410514192@qq.com> Date: Thu, 24 Oct 2024 13:47:45 +0800 Subject: [PATCH 1/2] fix: docker fetch error log --- app/api/server/route.ts | 10 ++++++++++ lib/serverFetch.tsx | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/api/server/route.ts b/app/api/server/route.ts index e0cf64e..e222749 100644 --- a/app/api/server/route.ts +++ b/app/api/server/route.ts @@ -11,6 +11,7 @@ interface NezhaDataResponse { error?: string; data?: ServerApi; cause?: string; + code?: string; } export const GET = auth(async function GET(req) { @@ -28,5 +29,14 @@ export const GET = auth(async function GET(req) { { status: 400 }, ); } + if (response.code === "ConnectionRefused") { + return NextResponse.json( + { cause: "server connect error" }, + { status: 400 }, + ); + } + if (!response.data) { + return NextResponse.json({ cause: "fetch data empty" }, { status: 400 }); + } return NextResponse.json(response, { status: 200 }); }); diff --git a/lib/serverFetch.tsx b/lib/serverFetch.tsx index 5c2be27..ebb2c0b 100644 --- a/lib/serverFetch.tsx +++ b/lib/serverFetch.tsx @@ -75,7 +75,7 @@ export async function GetNezhaData() { return data; } catch (error) { - console.error(error); + console.log("GetServerDetail error:", error); return error; } } From 1a3bc4650e58d36913230ee2a657f1fbd3fc0987 Mon Sep 17 00:00:00 2001 From: hamster1963 <1410514192@qq.com> Date: Thu, 24 Oct 2024 13:54:56 +0800 Subject: [PATCH 2/2] fix: add server side route error log --- app/api/detail/route.ts | 16 ++++++++++++++++ app/api/monitor/route.ts | 16 ++++++++++++++++ app/api/server/route.ts | 2 ++ 3 files changed, 34 insertions(+) diff --git a/app/api/detail/route.ts b/app/api/detail/route.ts index e8aae3b..b71ca10 100644 --- a/app/api/detail/route.ts +++ b/app/api/detail/route.ts @@ -10,6 +10,8 @@ export const dynamic = "force-dynamic"; interface NezhaDataResponse { error?: string; data?: NezhaAPISafe; + cause?: string; + code?: string; } export const GET = auth(async function GET(req) { @@ -32,5 +34,19 @@ export const GET = auth(async function GET(req) { console.log(response.error); return NextResponse.json({ error: response.error }, { status: 400 }); } + if (response.cause) { + console.log("GetServerDetail error(cause):", response); + return NextResponse.json( + { cause: "server connect error" }, + { status: 400 }, + ); + } + if (response.code === "ConnectionRefused") { + console.log("GetServerDetail error(code):", response); + return NextResponse.json( + { cause: "server connect error" }, + { status: 400 }, + ); + } return NextResponse.json(response, { status: 200 }); }); diff --git a/app/api/monitor/route.ts b/app/api/monitor/route.ts index 10c4420..a7a7834 100644 --- a/app/api/monitor/route.ts +++ b/app/api/monitor/route.ts @@ -10,6 +10,8 @@ export const dynamic = "force-dynamic"; interface NezhaDataResponse { error?: string; data?: ServerMonitorChart; + cause?: string; + code?: string; } export const GET = auth(async function GET(req) { @@ -32,5 +34,19 @@ export const GET = auth(async function GET(req) { console.log(response.error); return NextResponse.json({ error: response.error }, { status: 400 }); } + if (response.cause) { + console.log("GetServerMonitor error(cause):", response); + return NextResponse.json( + { cause: "server connect error" }, + { status: 400 }, + ); + } + if (response.code === "ConnectionRefused") { + console.log("GetServerMonitor error(code):", response); + return NextResponse.json( + { cause: "server connect error" }, + { status: 400 }, + ); + } return NextResponse.json(response, { status: 200 }); }); diff --git a/app/api/server/route.ts b/app/api/server/route.ts index e222749..6ff95aa 100644 --- a/app/api/server/route.ts +++ b/app/api/server/route.ts @@ -24,12 +24,14 @@ export const GET = auth(async function GET(req) { return NextResponse.json({ error: response.error }, { status: 400 }); } if (response.cause) { + console.log("GetNezhaData error(cause):", response); return NextResponse.json( { cause: "server connect error" }, { status: 400 }, ); } if (response.code === "ConnectionRefused") { + console.log("GetNezhaData error(code):", response); return NextResponse.json( { cause: "server connect error" }, { status: 400 },