From c7c6e8ffb47c387f87abede4de34599583feb9b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 13 Oct 2023 12:11:41 -0400 Subject: [PATCH] refactor: get rid of async.series --- src/database/postgres.js | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/database/postgres.js b/src/database/postgres.js index ee36941a17..6e034b7d0c 100644 --- a/src/database/postgres.js +++ b/src/database/postgres.js @@ -1,7 +1,6 @@ 'use strict'; const winston = require('winston'); -const async = require('async'); const nconf = require('nconf'); const session = require('express-session'); const semver = require('semver'); @@ -344,26 +343,20 @@ ALTER TABLE "session" return done(db); }; -postgresModule.createIndices = function (callback) { +postgresModule.createIndices = async function () { if (!postgresModule.pool) { winston.warn('[database/createIndices] database not initialized'); - return callback(); + return; } - - const query = postgresModule.pool.query.bind(postgresModule.pool); - winston.info('[database] Checking database indices.'); - async.series([ - async.apply(query, `CREATE INDEX IF NOT EXISTS "idx__legacy_zset__key__score" ON "legacy_zset"("_key" ASC, "score" DESC)`), - async.apply(query, `CREATE INDEX IF NOT EXISTS "idx__legacy_object__expireAt" ON "legacy_object"("expireAt" ASC)`), - ], (err) => { - if (err) { - winston.error(`Error creating index ${err.message}`); - return callback(err); - } + try { + await postgresModule.pool.query(`CREATE INDEX IF NOT EXISTS "idx__legacy_zset__key__score" ON "legacy_zset"("_key" ASC, "score" DESC)`); + await postgresModule.pool.query(`CREATE INDEX IF NOT EXISTS "idx__legacy_object__expireAt" ON "legacy_object"("expireAt" ASC)`); winston.info('[database] Checking database indices done!'); - callback(); - }); + } catch (err) { + winston.error(`Error creating index ${err.message}`); + throw err; + } }; postgresModule.checkCompatibility = function (callback) {