X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fdatabase.ts;h=141566c3ae480d9a7881044f48bd31048bbea6e3;hb=343ad675f2a26c15b86150a9a3552e619d5d44f4;hp=ade72b62f0941df889813420aaf48ab190fd3332;hpb=f5028693a896a3076dd286ac0030e3d8f78f5ebf;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index ade72b62f..141566c3a 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -64,6 +64,7 @@ const sequelize = new Sequelize(dbname, username, password, {
   port: CONFIG.DATABASE.PORT,
   benchmark: isTestInstance(),
   isolationLevel: Sequelize.Transaction.ISOLATION_LEVELS.SERIALIZABLE,
+  operatorsAliases: false,
 
   logging: (message: string, benchmark: number) => {
     let newMessage = message
@@ -83,9 +84,14 @@ database.init = async (silent: boolean) => {
   const filePaths = await getModelFiles(modelDirectory)
 
   for (const filePath of filePaths) {
-    const model = sequelize.import(filePath)
+    try {
+      const model = sequelize.import(filePath)
 
-    database[model['name']] = model
+      database[model['name']] = model
+    } catch (err) {
+      logger.error('Cannot import database model %s.', filePath, err)
+      process.exit(0)
+    }
   }
 
   for (const modelName of Object.keys(database)) {
@@ -96,7 +102,7 @@ database.init = async (silent: boolean) => {
 
   if (!silent) logger.info('Database %s is ready.', dbname)
 
-  return undefined
+  return
 }
 
 // ---------------------------------------------------------------------------