Refactor prisma-client and background-tasks for improved SIGTERM hand…

…ling - Reintroduced the ensurePolyfilled function in prisma-client.tsx to ensure environment variables are expanded. - Simplified the PostgreSQL connection pool setup by removing dynamic pool size configuration, defaulting to a max of 25. - Enhanced SIGTERM handling to ensure graceful shutdown of background tasks and database connections, with clearer comments for maintainability. - Updated background-tasks.tsx to clarify the purpose of in-flight promises during shutdown. These changes improve the reliability and clarity of the database connection management and shutdown process.
stack-auth · mantrakp04 · Apr 11, 2026 · Apr 2, 2026 · Apr 2, 2026 · Apr 2, 2026
commit 35466635a3a35f4a837156c118a8c8ff688350b2
diff --git a/apps/backend/src/prisma-client.tsx b/apps/backend/src/prisma-client.tsx
@@ -20,8 +20,8 @@ import { isPromise } from "util/types";
 import { runMigrationNeeded } from "./auto-migrations";
 import { registerPgPool } from "./lib/dev-perf-stats";
 import { Tenancy } from "./lib/tenancies";
-import { ensurePolyfilled } from "./polyfills";
 import { drainInFlightPromises } from "./utils/background-tasks";
+import { ensurePolyfilled } from "./polyfills";
 
 // just ensure we're polyfilled because this file relies on envvars being expanded
 ensurePolyfilled();
@@ -85,13 +85,9 @@ function getPostgresPrismaClient(connectionString: string, poolLabel?: string) {
   let postgresPrismaClient = postgresPrismaClientsStore.get(connectionString);
   if (!postgresPrismaClient) {
     const schema = getSchemaFromConnectionString(connectionString);
-    const poolMaxRaw = parseInt(getEnvVariable("STACK_DATABASE_POOL_MAX", "25"), 10);
-    const poolMax = Number.isFinite(poolMaxRaw) && poolMaxRaw > 0 ? poolMaxRaw : 25;
-    const pool = new Pool({ connectionString, max: poolMax });
-    pool.on('error', (err) => {
-      // Prevent unhandled rejections from crashing the process (e.g. on Cloud Run)
-      captureError("pg-pool-error", err);
-    });
+    const pool = new Pool({ connectionString, max: 25 });
+    // pg Pool emits 'error' on idle clients (e.g. TCP reset); unhandled = process crash
+    pool.on('error', (err) => captureError("pg-pool-error", err));
     registerPgPool(pool, poolLabel ?? connectionString); // Register pool for dev performance stats
     const adapter = new PrismaPg(pool, schema ? { schema } : undefined);
     postgresPrismaClient = {
@@ -103,25 +99,20 @@ function getPostgresPrismaClient(connectionString: string, poolLabel?: string) {
   return postgresPrismaClient;
 }
 
-// Graceful shutdown for non-Vercel runtimes (Cloud Run sends SIGTERM before shutdown)
+// Cloud Run sends SIGTERM before shutdown; drain background tasks and close DB connections.
 if (!getEnvVariable("VERCEL", "") && !globalVar.__stack_prisma_sigterm_registered) {
   globalVar.__stack_prisma_sigterm_registered = true;
   process.on("SIGTERM", () => {
-    // Keep the event loop alive so Node doesn't exit before the drain completes.
-    // 10s timeout > 8s drain timeout to ensure we have enough time.
     const keepAlive = setTimeout(() => {}, 10_000);
-
     runAsynchronously(async () => {
       try {
-        console.log("[SIGTERM] Draining background tasks and database connections...");
         await drainInFlightPromises(8000);
         for (const [, entry] of postgresPrismaClientsStore) {
           await entry.client.$disconnect();
         }
         for (const [, client] of prismaClientsStore.neon) {
           await client.$disconnect();
         }
-        console.log("[SIGTERM] Completed draining background tasks and database connections.");
       } finally {
         clearTimeout(keepAlive);
       }

diff --git a/apps/backend/src/utils/background-tasks.tsx b/apps/backend/src/utils/background-tasks.tsx
@@ -1,10 +1,7 @@
 import { getEnvVariable } from "@stackframe/stack-shared/dist/utils/env";
 import { ignoreUnhandledRejection, runAsynchronously } from "@stackframe/stack-shared/dist/utils/promises";
 
-/**
- * In-flight background promises tracked for graceful shutdown on non-Vercel runtimes (e.g. Cloud Run).
- * On SIGTERM, we drain these before exiting. See SIGTERM handler in prisma-client.tsx.
- */
+// Tracked for SIGTERM drain on non-Vercel runtimes (e.g. Cloud Run).
 const inFlightPromises = new Set<Promise<unknown>>();
 
 const isVercel = !!getEnvVariable("VERCEL", "");

diff --git a/apps/e2e/tests/js/inheritance.test.ts b/apps/e2e/tests/js/inheritance.test.ts
@@ -4,6 +4,8 @@ import { isUuid } from "@stackframe/stack-shared/dist/utils/uuids";
 import { STACK_BACKEND_BASE_URL, it } from "../helpers";
 import { scaffoldProject } from "./js-helpers";
 
+// When STACK_TEST_SDK_FALLBACK is set, omit explicit baseUrl so the SDK resolves
+// from NEXT_PUBLIC_STACK_API_URL and exercises its fallback logic
 const sdkBaseUrl = process.env.STACK_TEST_SDK_FALLBACK ? undefined : STACK_BACKEND_BASE_URL;
 
 it("StackServerApp can inherit configuration from StackClientApp", async ({ expect }) => {