aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/initializers
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-01-10 17:18:12 +0100
committerChocobozzz <me@florianbigard.com>2018-01-10 17:19:14 +0100
commit2ccaeeb341ffe8c2609039bf4c6d8835b4650316 (patch)
treea6bf6e05e7f02bc315e872d67a0b61ad6ad3d777 /server/initializers
parent759f8a29e95932023564ca98dcbc90d1acb92da0 (diff)
downloadPeerTube-2ccaeeb341ffe8c2609039bf4c6d8835b4650316.tar.gz
PeerTube-2ccaeeb341ffe8c2609039bf4c6d8835b4650316.tar.zst
PeerTube-2ccaeeb341ffe8c2609039bf4c6d8835b4650316.zip
Fetch remote AP objects
Diffstat (limited to 'server/initializers')
-rw-r--r--server/initializers/constants.ts1
-rw-r--r--server/initializers/installer.ts2
-rw-r--r--server/initializers/migrator.ts4
3 files changed, 4 insertions, 3 deletions
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 = {
279 TORRENT: [ 'application/x-bittorrent' ], 279 TORRENT: [ 'application/x-bittorrent' ],
280 MAGNET: [ 'application/x-bittorrent;x-scheme-handler/magnet' ] 280 MAGNET: [ 'application/x-bittorrent;x-scheme-handler/magnet' ]
281 }, 281 },
282 MAX_RECURSION_COMMENTS: 100,
282 ACTOR_REFRESH_INTERVAL: 3600 * 24 // 1 day 283 ACTOR_REFRESH_INTERVAL: 3600 * 24 // 1 day
283} 284}
284 285
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 () {
20 await createOAuthAdminIfNotExist() 20 await createOAuthAdminIfNotExist()
21 } catch (err) { 21 } catch (err) {
22 logger.error('Cannot install application.', err) 22 logger.error('Cannot install application.', err)
23 throw err 23 process.exit(-1)
24 } 24 }
25} 25}
26 26
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 () {
44 await executeMigration(actualVersion, migrationScript) 44 await executeMigration(actualVersion, migrationScript)
45 } catch (err) { 45 } catch (err) {
46 logger.error('Cannot execute migration %s.', migrationScript.version, err) 46 logger.error('Cannot execute migration %s.', migrationScript.version, err)
47 process.exit(0) 47 process.exit(-1)
48 } 48 }
49 } 49 }
50 50
@@ -92,7 +92,7 @@ async function executeMigration (actualVersion: number, entity: { version: strin
92 92
93 const migrationScript = require(path.join(__dirname, 'migrations', migrationScriptName)) 93 const migrationScript = require(path.join(__dirname, 'migrations', migrationScriptName))
94 94
95 await sequelizeTypescript.transaction(async t => { 95 return sequelizeTypescript.transaction(async t => {
96 const options = { 96 const options = {
97 transaction: t, 97 transaction: t,
98 queryInterface: sequelizeTypescript.getQueryInterface(), 98 queryInterface: sequelizeTypescript.getQueryInterface(),