Fix tests

pull/3120/head
Chocobozzz 2020-08-24 14:11:15 +02:00
parent 8b6f0fd53d
commit 74055dc882
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 12 additions and 7 deletions

View File

@ -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))

View File

@ -77,13 +77,15 @@ const sequelizeTypescript = new SequelizeTypescript({
}
})
sequelizeTypescript.authenticate()
.then(() => logger.debug('Connection to PostgreSQL has been established successfully.'))
.catch(err => {
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)
})
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
}