From 74055dc882e484b217f398917a3cc24bf2ea8cbe Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 24 Aug 2020 14:11:15 +0200 Subject: Fix tests --- server.ts | 4 +++- server/initializers/database.ts | 17 ++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/server.ts b/server.ts index 1286cf521..e83fabb98 100644 --- a/server.ts +++ b/server.ts @@ -70,7 +70,9 @@ if (CONFIG.CSP.ENABLED) { // ----------- Database ----------- // Initialize database and models -import { initDatabaseModels } from './server/initializers/database' +import { initDatabaseModels, checkDatabaseConnectionOrDie } from './server/initializers/database' +checkDatabaseConnectionOrDie() + import { migrate } from './server/initializers/migrator' migrate() .then(() => initDatabaseModels(false)) diff --git a/server/initializers/database.ts b/server/initializers/database.ts index e05e7c335..a20cdacc3 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -77,13 +77,15 @@ const sequelizeTypescript = new SequelizeTypescript({ } }) -sequelizeTypescript.authenticate() - .then(() => logger.debug('Connection to PostgreSQL has been established successfully.')) - .catch(err => { - - logger.error('Unable to connect to PostgreSQL database.', { err }) - process.exit(-1) - }) +function checkDatabaseConnectionOrDie () { + sequelizeTypescript.authenticate() + .then(() => logger.debug('Connection to PostgreSQL has been established successfully.')) + .catch(err => { + + logger.error('Unable to connect to PostgreSQL database.', { err }) + process.exit(-1) + }) +} async function initDatabaseModels (silent: boolean) { sequelizeTypescript.addModels([ @@ -140,6 +142,7 @@ async function initDatabaseModels (silent: boolean) { export { initDatabaseModels, + checkDatabaseConnectionOrDie, sequelizeTypescript } -- cgit v1.2.3