X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fdatabase.ts;h=a20cdacc3bac1dda19b7779d173342c82a19ca05;hb=b52cb840eb5bbc55dc7e930dc8ce43429daaf79a;hp=0775f1fadc75ed56ede1826f62ee7cc440821c00;hpb=ec903c010ecc54ec2acad0bf2cf10e7fbf6a0fa2;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index 0775f1fad..a20cdacc3 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -1,6 +1,7 @@
 import { QueryTypes, Transaction } from 'sequelize'
 import { Sequelize as SequelizeTypescript } from 'sequelize-typescript'
 import { AbuseModel } from '@server/models/abuse/abuse'
+import { AbuseMessageModel } from '@server/models/abuse/abuse-message'
 import { VideoAbuseModel } from '@server/models/abuse/video-abuse'
 import { VideoCommentAbuseModel } from '@server/models/abuse/video-comment-abuse'
 import { isTestInstance } from '../helpers/core-utils'
@@ -47,6 +48,7 @@ const dbname = CONFIG.DATABASE.DBNAME
 const username = CONFIG.DATABASE.USERNAME
 const password = CONFIG.DATABASE.PASSWORD
 const host = CONFIG.DATABASE.HOSTNAME
+const ssl = CONFIG.DATABASE.SSL
 const port = CONFIG.DATABASE.PORT
 const poolMax = CONFIG.DATABASE.POOL.MAX
 
@@ -57,6 +59,7 @@ const sequelizeTypescript = new SequelizeTypescript({
   port,
   username,
   password,
+  ssl,
   pool: {
     max: poolMax
   },
@@ -74,6 +77,16 @@ const sequelizeTypescript = new SequelizeTypescript({
   }
 })
 
+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([
     ApplicationModel,
@@ -87,6 +100,7 @@ async function initDatabaseModels (silent: boolean) {
     TagModel,
     AccountVideoRateModel,
     UserModel,
+    AbuseMessageModel,
     AbuseModel,
     VideoCommentAbuseModel,
     VideoAbuseModel,
@@ -128,6 +142,7 @@ async function initDatabaseModels (silent: boolean) {
 
 export {
   initDatabaseModels,
+  checkDatabaseConnectionOrDie,
   sequelizeTypescript
 }