From 2ccaeeb341ffe8c2609039bf4c6d8835b4650316 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 10 Jan 2018 17:18:12 +0100 Subject: Fetch remote AP objects --- server/initializers/constants.ts | 1 + server/initializers/installer.ts | 2 +- server/initializers/migrator.ts | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'server/initializers') diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index c902e0cf6..c735e6daf 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -279,6 +279,7 @@ const ACTIVITY_PUB = { TORRENT: [ 'application/x-bittorrent' ], MAGNET: [ 'application/x-bittorrent;x-scheme-handler/magnet' ] }, + MAX_RECURSION_COMMENTS: 100, ACTOR_REFRESH_INTERVAL: 3600 * 24 // 1 day } diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts index 58713c2c4..324a2c2e5 100644 --- a/server/initializers/installer.ts +++ b/server/initializers/installer.ts @@ -20,7 +20,7 @@ async function installApplication () { await createOAuthAdminIfNotExist() } catch (err) { logger.error('Cannot install application.', err) - throw err + process.exit(-1) } } diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts index 29310b913..9ebc57f07 100644 --- a/server/initializers/migrator.ts +++ b/server/initializers/migrator.ts @@ -44,7 +44,7 @@ async function migrate () { await executeMigration(actualVersion, migrationScript) } catch (err) { logger.error('Cannot execute migration %s.', migrationScript.version, err) - process.exit(0) + process.exit(-1) } } @@ -92,7 +92,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(), -- cgit v1.2.3