X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fmigrator.ts;h=539e2bc8fbaeb17a6ba52af3334db7296086fb6e;hb=eed24d26db4c8363d5e5874841ee0c4f5fa275a8;hp=bb2539fc88e3297b8f1af44df4b7acf027b05317;hpb=91fea9fc48a4ce53dd69e0e20f5804ad95a6c27d;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts
index bb2539fc8..539e2bc8f 100644
--- a/server/initializers/migrator.ts
+++ b/server/initializers/migrator.ts
@@ -1,5 +1,6 @@
 import * as path from 'path'
-import { logger, readdirPromise } from '../helpers'
+import { readdirPromise } from '../helpers/core-utils'
+import { logger } from '../helpers/logger'
 import { LAST_MIGRATION_VERSION } from './constants'
 import { sequelizeTypescript } from './database'
 
@@ -10,19 +11,11 @@ async function migrate () {
   // The installer will do that
   if (tables.length === 0) return
 
-  let actualVersion: number = null
+  let actualVersion: number | null = null
 
-  // Search in "Applications" or "application" tables
-  try {
-    const [ rows ] = await sequelizeTypescript.query('SELECT "migrationVersion" FROM "Applications"')
-    if (rows && rows[ 0 ] && rows[ 0 ].migrationVersion) {
-      actualVersion = rows[ 0 ].migrationVersion
-    }
-  } catch {
-    const [ rows ] = await sequelizeTypescript.query('SELECT "migrationVersion" FROM "application"')
-    if (rows && rows[0] && rows[0].migrationVersion) {
-      actualVersion = rows[0].migrationVersion
-    }
+  const [ rows ] = await sequelizeTypescript.query('SELECT "migrationVersion" FROM "application"')
+  if (rows && rows[0] && rows[0].migrationVersion) {
+    actualVersion = rows[0].migrationVersion
   }
 
   if (actualVersion === null) {
@@ -42,8 +35,8 @@ async function migrate () {
     try {
       await executeMigration(actualVersion, migrationScript)
     } catch (err) {
-      logger.error('Cannot execute migration %s.', migrationScript.version, err)
-      process.exit(0)
+      logger.error('Cannot execute migration %s.', migrationScript.version, { err })
+      process.exit(-1)
     }
   }
 
@@ -91,7 +84,7 @@ async function executeMigration (actualVersion: number, entity: { version: strin
 
   const migrationScript = require(path.join(__dirname, 'migrations', migrationScriptName))
 
-  await sequelizeTypescript.transaction(async t => {
+  return sequelizeTypescript.transaction(async t => {
     const options = {
       transaction: t,
       queryInterface: sequelizeTypescript.getQueryInterface(),