Use a singleton for the DB connection

mozilla · Oct 31, 2024 · e7a2b23 · e7a2b23
1 parent 2a212cb
commit e7a2b23
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/db/connect.ts b/src/db/connect.ts
@@ -5,6 +5,7 @@
 import knex from "knex";
 import knexConfig from "./knexfile.js";
 
+let connection: knex.Knex;
 export default function createDbConnection(): knex.Knex {
   /* c8 ignore start */
   if (process.env.NODE_ENV === "development") {
@@ -15,9 +16,11 @@ export default function createDbConnection(): knex.Knex {
       );
     }
 
-    return (global as unknown as Record<string, knex.Knex>)[client];
+    connection ??= (global as unknown as Record<string, knex.Knex>)[client];
+    return connection;
   }
   /* c8 ignore stop */
 
-  return knex(knexConfig as knex.Knex.Config);
+  connection ??= knex(knexConfig as knex.Knex.Config);
+  return connection;
 }
diff --git a/src/scripts/cronjobs/monthlyActivityFree.tsx b/src/scripts/cronjobs/monthlyActivityFree.tsx
@@ -4,21 +4,23 @@
 
 import { SubscriberRow } from "knex/types/tables";
 import { getFreeSubscribersWaitingForMonthlyEmail } from "../../db/tables/subscribers";
+import { getLatestOnerepScanResults } from "../../db/tables/onerep_scans";
+import { updateEmailPreferenceForSubscriber } from "../../db/tables/subscriber_email_preferences";
 import { initEmail, sendEmail, closeEmailPool } from "../../utils/email";
 import { renderEmail } from "../../emails/renderEmail";
 import { MonthlyActivityFreeEmail } from "../../emails/templates/monthlyActivityFree/MonthlyActivityFreeEmail";
 import { getCronjobL10n } from "../../app/functions/l10n/cronjobs";
 import { sanitizeSubscriberRow } from "../../app/functions/server/sanitize";
 import { getDashboardSummary } from "../../app/functions/server/dashboard";
-import { getLatestOnerepScanResults } from "../../db/tables/onerep_scans";
 import { getSubscriberBreaches } from "../../app/functions/server/getSubscriberBreaches";
 import { refreshStoredScanResults } from "../../app/functions/server/refreshStoredScanResults";
 import { getSignupLocaleCountry } from "../../emails/functions/getSignupLocaleCountry";
-import { updateEmailPreferenceForSubscriber } from "../../db/tables/subscriber_email_preferences";
+import createDbConnection from "../../db/connect";
 import { logger } from "../../app/functions/server/logging";
 import { getMonthlyActivityFreeUnsubscribeLink } from "../../app/functions/cronjobs/unsubscribeLinks";
 
-void run();
+await run();
+await createDbConnection().destroy();
 
 async function run() {
   const batchSize = Number.parseInt(