trails-cool/trails
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #180 from trails-cool/fix/planner-health-connection-leak

Browse source 
Fix DB connection leak in health check handlers
This commit is contained in:
Ullrich Schäfer 2026-04-06 21:42:43 +01:00 • committed by GitHub
commit 64231252bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
apps/journal/app/routes/api.health.ts
View file

@ -1,13 +0,0 @@
import { data } from "react-router";
import { withDb } from "@trails-cool/db";
const version = process.env.SENTRY_RELEASE ?? "dev";
export async function loader() {
try {
await withDb(async () => {});
return data({ status: "ok", version, db: "connected" });
} catch {
return data({ status: "degraded", version, db: "unreachable" }, { status: 503 });
}
}

9
apps/journal/server.ts
View file

@ -4,6 +4,7 @@ import { createReadStream, statSync } from "node:fs";
import { join, extname, resolve } from "node:path";
import { logger } from "./app/lib/logger.server.ts";
import { httpRequestDuration, registry } from "./app/lib/metrics.server.ts";
import postgres from "postgres";
const port = Number(process.env.PORT ?? 3000);
const CLIENT_DIR = resolve(import.meta.dirname, "build", "client");
@ -56,16 +57,16 @@ async function handleMetrics(_req: IncomingMessage, res: ServerResponse): Promis
const version = process.env.SENTRY_RELEASE ?? "dev";
async function handleHealth(_req: IncomingMessage, res: ServerResponse): Promise<void> {
const client = postgres(process.env.DATABASE_URL ?? "postgres://trails:trails@localhost:5432/trails", { max: 1 });
try {
const { createDb } = await import("@trails-cool/db");
const { sql } = await import("drizzle-orm");
const db = createDb();
await db.execute(sql`SELECT 1`);
await client`SELECT 1`;
res.writeHead(200, { "Content-Type": "application/json" });
res.end(JSON.stringify({ status: "ok", version, db: "connected" }));
} catch {
res.writeHead(503, { "Content-Type": "application/json" });
res.end(JSON.stringify({ status: "degraded", version, db: "unreachable" }));
} finally {
await client.end();
}
}

9
apps/planner/server.ts
View file

@ -6,6 +6,7 @@ import { createServer, type IncomingMessage, type ServerResponse } from "node:ht
import { createReadStream, statSync } from "node:fs";
import { join, extname, resolve } from "node:path";
import { setupYjsWebSocket } from "./app/lib/yjs-server.ts";
import postgres from "postgres";
const sentryEnvironment = process.env.CI ? "ci" : (process.env.NODE_ENV ?? "development");
@ -74,16 +75,16 @@ async function handleMetrics(_req: IncomingMessage, res: ServerResponse): Promis
const version = process.env.SENTRY_RELEASE ?? "dev";
async function handleHealth(_req: IncomingMessage, res: ServerResponse): Promise<void> {
const client = postgres(process.env.DATABASE_URL ?? "postgres://trails:trails@localhost:5432/trails", { max: 1 });
try {
const { createDb } = await import("@trails-cool/db");
const { sql } = await import("drizzle-orm");
const db = createDb();
await db.execute(sql`SELECT 1`);
await client`SELECT 1`;
res.writeHead(200, { "Content-Type": "application/json" });
res.end(JSON.stringify({ status: "ok", version, db: "connected" }));
} catch {
res.writeHead(503, { "Content-Type": "application/json" });
res.end(JSON.stringify({ status: "degraded", version, db: "unreachable" }));
} finally {
await client.end();
}
}