fix: pool does not need connect

nftstorage · Feb 28, 2022 · 1db831e · 1db831e
1 parent 8b8e817
commit 1db831e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/packages/cron/src/bin/metrics.js b/packages/cron/src/bin/metrics.js
@@ -4,16 +4,13 @@ import path from 'path'
 import { fileURLToPath } from 'url'
 import dotenv from 'dotenv'
 import { updateMetrics } from '../jobs/metrics.js'
-import { getPg } from '../lib/utils.js'
+import { getPgPool } from '../lib/utils.js'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 async function main() {
-  const rwPg = getPg(process.env, 'rw')
-  const roPg = getPg(process.env, 'ro')
-
-  await rwPg.connect()
-  await roPg.connect()
+  const rwPg = getPgPool(process.env, 'rw')
+  const roPg = getPgPool(process.env, 'ro')
 
   try {
     await updateMetrics({ rwPg, roPg })

diff --git a/packages/cron/src/jobs/metrics.js b/packages/cron/src/jobs/metrics.js
@@ -9,7 +9,7 @@ import {
 const log = debug('metrics:updateMetrics')
 
 /**
- * @typedef {import('pg').Client} Client
+ * @typedef {import('pg').Pool} Client
  * @typedef {{ name: string, value: number }} Metric
  */
 

diff --git a/packages/cron/src/lib/utils.js b/packages/cron/src/lib/utils.js
@@ -81,6 +81,24 @@ export function getDBClient(env) {
  * @param {'ro'|'rw'} [mode]
  */
 export function getPg(env, mode = 'rw') {
+  return new pg.Client({ connectionString: getPgConnString(env, mode) })
+}
+
+/**
+ * Create a new Postgres pool instance from the passed environment variables.
+ * @param {Record<string, string|undefined>} env
+ * @param {'ro'|'rw'} [mode]
+ */
+export function getPgPool(env, mode = 'rw') {
+  return new pg.Pool({ connectionString: getPgConnString(env, mode) })
+}
+
+/**
+ * Get a postgres connection string from the passed environment variables.
+ * @param {Record<string, string|undefined>} env
+ * @param {'ro'|'rw'} [mode]
+ */
+function getPgConnString(env, mode = 'rw') {
   let connectionString
   if (env.ENV === 'production') {
     connectionString =
@@ -97,5 +115,5 @@ export function getPg(env, mode = 'rw') {
       mode === 'rw' ? env.DATABASE_CONNECTION : env.RO_DATABASE_CONNECTION
   }
   if (!connectionString) throw new Error('missing Postgres connection string')
-  return new pg.Pool({ connectionString, allowExitOnIdle: true })
+  return connectionString
 }